diff options
-rw-r--r-- | arch/arm/cpu/armv7/ls102xa/Kconfig | 9 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/ls102xa/soc.c | 2 | ||||
-rw-r--r-- | board/freescale/ls1021atsn/README.rst | 2 | ||||
-rw-r--r-- | drivers/misc/ls2_sfp.c | 2 |
4 files changed, 12 insertions, 3 deletions
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 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/ 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; |