summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv8/fsl-layerscape/soc.c
diff options
context:
space:
mode:
authorQianyu Gong <qianyu.gong@nxp.com>2016-03-16 18:01:52 +0800
committerYork Sun <york.sun@nxp.com>2016-03-28 17:35:38 -0700
commit258b8c93ec25a7fd8e099b28a1149574935b255e (patch)
tree2d0162e1e34a28d1ded96a985eaa09f3a495390f /arch/arm/cpu/armv8/fsl-layerscape/soc.c
parentad6767b6e9744eb210e9dd815ee68ebdca15151f (diff)
downloadblackbird-obmc-uboot-258b8c93ec25a7fd8e099b28a1149574935b255e.tar.gz
blackbird-obmc-uboot-258b8c93ec25a7fd8e099b28a1149574935b255e.zip
armv8: fsl-layerscape: Skip reconfigure QSPI clock when booting from QSPI
The qspi_cfg register is set by PBI when booting from QSPI. No need to changing it again. Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'arch/arm/cpu/armv8/fsl-layerscape/soc.c')
-rw-r--r--arch/arm/cpu/armv8/fsl-layerscape/soc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 213ce3a824..bf0474283f 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -240,7 +240,7 @@ void fsl_lsch2_early_init_f(void)
init_early_memctl_regs(); /* tighten IFC timing */
#endif
-#ifdef CONFIG_FSL_QSPI
+#if defined(CONFIG_FSL_QSPI) && !defined(CONFIG_QSPI_BOOT)
out_be32(&scfg->qspi_cfg, SCFG_QSPI_CLKSEL);
#endif
/* Make SEC reads and writes snoopable */
OpenPOWER on IntegriCloud