summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorGong Qianyu <Qianyu.Gong@freescale.com>2016-01-25 15:16:06 +0800
committerYork Sun <york.sun@nxp.com>2016-01-27 08:28:55 -0800
commit166ef1e90ce404a6470a1c4910a1e84404379b86 (patch)
tree8491a335879611ed1629a1b46ba7a2b3db6cb62c /arch/arm
parente0579a5852b3edb09f965dbbbd0b49507931be95 (diff)
downloadu-boot-imx-166ef1e90ce404a6470a1c4910a1e84404379b86.zip
u-boot-imx-166ef1e90ce404a6470a1c4910a1e84404379b86.tar.gz
u-boot-imx-166ef1e90ce404a6470a1c4910a1e84404379b86.tar.bz2
armv8/ls1043aqds: add QSPI support in SD boot
QSPI and IFC are pin-multiplexed on LS1043A. So we use ls1043aqds_sdcard_ifc_defconfig to support IFC in SD boot and ls1043aqds_sdcard_qspi_defconfig to support QSPI in SD boot. Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com> Reviewed-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/armv8/fsl-layerscape/soc.c3
-rw-r--r--arch/arm/dts/fsl-ls1043a.dtsi10
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index d97a445..7ff0148 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -222,6 +222,9 @@ void fsl_lsch2_early_init_f(void)
init_early_memctl_regs(); /* tighten IFC timing */
#endif
+#ifdef CONFIG_FSL_QSPI
+ out_be32(&scfg->qspi_cfg, SCFG_QSPI_CLKSEL);
+#endif
/* Make SEC reads and writes snoopable */
setbits_be32(&scfg->snpcnfgcr, SCFG_SNPCNFGCR_SECRDSNP |
SCFG_SNPCNFGCR_SECWRSNP);
diff --git a/arch/arm/dts/fsl-ls1043a.dtsi b/arch/arm/dts/fsl-ls1043a.dtsi
index 12ea0ab..66b409a 100644
--- a/arch/arm/dts/fsl-ls1043a.dtsi
+++ b/arch/arm/dts/fsl-ls1043a.dtsi
@@ -236,5 +236,15 @@
clock-names = "ipg";
status = "disabled";
};
+ qspi: quadspi@1550000 {
+ compatible = "fsl,vf610-qspi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x1550000 0x10000>,
+ <0x40000000 0x4000000>;
+ num-cs = <2>;
+ big-endian;
+ status = "disabled";
+ };
};
};