From: Qianyu Gong <qianyu.gong@nxp.com>
Date: Wed, 16 Mar 2016 10:01:52 +0000 (+0800)
Subject: armv8: fsl-layerscape: Skip reconfigure QSPI clock when booting from QSPI
X-Git-Tag: v2016.05-rc1~120^2~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=258b8c93ec25a7fd8e099b28a1149574935b255e;p=oweals%2Fu-boot.git

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>
---

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 */