diff options
| author | Tom Rini <[email protected]> | 2026-01-28 08:39:52 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-01-28 08:39:52 -0600 |
| commit | cd4f4f74213aa02df1a0f2c533cd2cabfac6aa2e (patch) | |
| tree | afd975b1faab29828f8fdf73eb0aa063a7025fa4 /drivers | |
| parent | 4234f4d432bf1dcd30b5fee91c71abc1acae5e75 (diff) | |
| parent | 8e918cbe7a1cb87d0b18df91ed1edec9fff2f941 (diff) | |
Merge tag 'fsl-qoriq-for-2026.04-rc2' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Rename freescale to nxp
- Add CPLD support via IFC to the ls1021a-iot board
- Use scmi_clk_state_in_v2 in sandbox
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/scmi/sandbox-scmi_agent.c | 4 | ||||
| -rw-r--r-- | drivers/misc/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/mmc/fsl_esdhc.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/drivers/firmware/scmi/sandbox-scmi_agent.c b/drivers/firmware/scmi/sandbox-scmi_agent.c index 5b242a039c2..010bf99fbc6 100644 --- a/drivers/firmware/scmi/sandbox-scmi_agent.c +++ b/drivers/firmware/scmi/sandbox-scmi_agent.c @@ -828,7 +828,7 @@ static int sandbox_scmi_clock_rate_get(struct udevice *dev, static int sandbox_scmi_clock_gate(struct udevice *dev, struct scmi_msg *msg) { - struct scmi_clk_state_in_v1 *in = NULL; + struct scmi_clk_state_in_v2 *in = NULL; struct scmi_clk_state_out *out = NULL; struct sandbox_scmi_clk *clk_state = NULL; @@ -836,7 +836,7 @@ static int sandbox_scmi_clock_gate(struct udevice *dev, struct scmi_msg *msg) !msg->out_msg || msg->out_msg_sz < sizeof(*out)) return -EINVAL; - in = (struct scmi_clk_state_in_v1 *)msg->in_msg; + in = (struct scmi_clk_state_in_v2 *)msg->in_msg; out = (struct scmi_clk_state_out *)msg->out_msg; clk_state = get_scmi_clk_state(in->clock_id); diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index dde773ab6b1..be7fdab56d1 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -694,7 +694,12 @@ config ESM_PMIC typically to reboot the board in error condition. config FSL_IFC - bool + bool "Freescale Integrated Flash Controller" + depends on ARM + help + This driver is for the Integrated Flash Controller(IFC) module + available in Freescale SoCs. This controller allows to handle + devices such as NOR, NAND, FPGA and ASIC etc. config SL28CPLD bool "Enable Kontron sl28cpld multi-function driver" diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 683a7931c98..79296c4b580 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -29,7 +29,7 @@ #include <linux/iopoll.h> #include <linux/dma-mapping.h> #include <sdhci.h> -#include "../../board/freescale/common/qixis.h" +#include "../../board/nxp/common/qixis.h" DECLARE_GLOBAL_DATA_PTR; |