From a25dad74597824885d028e8631463295845ca9ee Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 12 Jan 2023 22:00:06 -0300 Subject: [PATCH 1/3] ls1021atsn: Suggest the NXP RCW github repo As explained in the text at the bottom of the page https://source.codeaurora.org/external/qoriq/qoriq-components/rcw: "QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023." Point to the NXP RCW github repo instead. Signed-off-by: Fabio Estevam Reviewed-by: Vladimir Oltean Signed-off-by: Peng Fan --- board/freescale/ls1021atsn/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/ls1021atsn/README.rst b/board/freescale/ls1021atsn/README.rst index cdec02f1a35..cd12291d8aa 100644 --- a/board/freescale/ls1021atsn/README.rst +++ b/board/freescale/ls1021atsn/README.rst @@ -50,7 +50,7 @@ To compile and flash an SD card image:: 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/ From ba89878d702954d5f438df29ff1b0e0e90519db9 Mon Sep 17 00:00:00 2001 From: Mario Kicherer Date: Wed, 1 Feb 2023 14:16:22 +0800 Subject: [PATCH 2/3] armv7: ls102xa: make QSPI clock selection optional during SoC init To improve startup times when booting from QSPI flash, the QSPI frequency can be configured very early in the boot process [1] to reduce loading times of U-Boot itself. This patch adds an option to disable setting the frequency to a default value during SoC initialization. [1] https://www.nxp.com/docs/en/application-note/AN12279.pdf Signed-off-by: Mario Kicherer Signed-off-by: Peng Fan --- arch/arm/cpu/armv7/ls102xa/Kconfig | 9 +++++++++ arch/arm/cpu/armv7/ls102xa/soc.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index 0edcf4c5ee7..3e292bf70e1 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -96,4 +96,13 @@ config SYS_FSL_HAS_CCI400 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 1dafa3c1b45..84d4ea3a8f4 100644 --- a/arch/arm/cpu/armv7/ls102xa/soc.c +++ b/arch/arm/cpu/armv7/ls102xa/soc.c @@ -170,7 +170,7 @@ int arch_soc_init(void) 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 From 4992d8360d83e0f9795abe5e54d75962e2fe3f48 Mon Sep 17 00:00:00 2001 From: Sean Anderson Date: Fri, 27 Jan 2023 11:54:53 -0500 Subject: [PATCH 3/3] misc: ls2_sfp: Fix regulator name Unlike in Linux, -supply is not automatically appended to regulator requests. Add it. Fixes: 2645bc0e12 ("arm: layerscape: Add sfp driver") Signed-off-by: Sean Anderson Signed-off-by: Peng Fan --- drivers/misc/ls2_sfp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/ls2_sfp.c b/drivers/misc/ls2_sfp.c index dd104962c28..2a81bc7de5f 100644 --- a/drivers/misc/ls2_sfp.c +++ b/drivers/misc/ls2_sfp.c @@ -229,7 +229,7 @@ static int ls2_sfp_probe(struct udevice *dev) 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;