Merge tag 'fsl-qoriq-2023-2-1' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq
make QSPI clock selection optional during SoC init for ls102xa
Fix regulator name for ls2_sfp
Update NXP RCW github repo
diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig
index 0edcf4c..3e292bf 100644
--- a/arch/arm/cpu/armv7/ls102xa/Kconfig
+++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
@@ -96,4 +96,13 @@
config SYS_FSL_ERRATUM_A008407
bool
+config SYS_FSL_QSPI_SKIP_CLKSEL
+ bool "Skip setting QSPI clock during SoC init"
+ default 0
+ help
+ To improve startup times when booting from QSPI flash, the QSPI
+ frequency can be set very early in the boot process. If this option
+ is enabled, the QSPI frequency will not be changed by U-Boot during
+ SoC initialization.
+
endmenu
diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c
index 1dafa3c..84d4ea3 100644
--- a/arch/arm/cpu/armv7/ls102xa/soc.c
+++ b/arch/arm/cpu/armv7/ls102xa/soc.c
@@ -170,7 +170,7 @@
enable_layerscape_ns_access();
#endif
-#ifdef CONFIG_FSL_QSPI
+#if defined(CONFIG_FSL_QSPI) && !defined(CONFIG_SYS_FSL_QSPI_SKIP_CLKSEL)
out_be32(&scfg->qspi_cfg, SCFG_QSPI_CLKSEL);
#endif
diff --git a/board/freescale/ls1021atsn/README.rst b/board/freescale/ls1021atsn/README.rst
index cdec02f..cd12291 100644
--- a/board/freescale/ls1021atsn/README.rst
+++ b/board/freescale/ls1021atsn/README.rst
@@ -50,7 +50,7 @@
For the QSPI flash, first obtain the Reset Configuration Word binary for
bootimg from the QSPI flash from the rcw project
-(https://source.codeaurora.org/external/qoriq/qoriq-components/rcw)::
+(https://github.com/nxp-qoriq/rcw)::
make -j 8 && sudo cp ls1021atsn/SSR_PNS_30/rcw_1200_qspiboot.bin.swapped /srv/tftpboot/
diff --git a/drivers/misc/ls2_sfp.c b/drivers/misc/ls2_sfp.c
index dd10496..2a81bc7 100644
--- a/drivers/misc/ls2_sfp.c
+++ b/drivers/misc/ls2_sfp.c
@@ -229,7 +229,7 @@
return -EINVAL;
}
- ret = device_get_supply_regulator(dev, "ta-sfp-prog", &priv->supply);
+ ret = device_get_supply_regulator(dev, "ta-sfp-prog-supply", &priv->supply);
if (ret && ret != -ENODEV && ret != -ENOSYS) {
dev_dbg(dev, "problem getting supply (err %d)\n", ret);
return ret;