diff mbox

[U-Boot] armv8: fsl-layerscape: don't reconfigure QSPI clock when booting from QSPI

Message ID 1458122512-18901-1-git-send-email-Qianyu.Gong@nxp.com
State Accepted
Commit 258b8c93ec25a7fd8e099b28a1149574935b255e
Delegated to: York Sun
Headers show

Commit Message

Gong Qianyu March 16, 2016, 10:01 a.m. UTC 
It has set the qspi_cfg register earlier through PBI when booting from
QSPI. We'd better not change it.

Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com>
---
 arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

York Sun March 29, 2016, 3:42 p.m. UTC | #1 
On 03/16/2016 03:11 AM, Gong Qianyu wrote:
> It has set the qspi_cfg register earlier through PBI when booting from
> QSPI. We'd better not change it.
> 
> Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com>
> ---
>  arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Minor change in subject and commit message.

Applied to u-boot-fsl-qoriq master. Awaiting upstream.

Thanks.

York
diff mbox

Patch

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 213ce3a..bf04742 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 */