summaryrefslogtreecommitdiff
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorAlison Wang <b18965@freescale.com>2015-10-28 10:40:23 +0800
committerYork Sun <yorksun@freescale.com>2015-10-29 10:33:56 -0700
commit0cbba8e9532f1e8cff5190baf7a4f23c27f67db4 (patch)
tree127d0c01ae82381b0572dc1b1c8b9c9fcfe35f6a /arch/arm/cpu
parent947cee1127c5fa97529c8cda4f0b48d141f92560 (diff)
downloadu-boot-imx-0cbba8e9532f1e8cff5190baf7a4f23c27f67db4.zip
u-boot-imx-0cbba8e9532f1e8cff5190baf7a4f23c27f67db4.tar.gz
u-boot-imx-0cbba8e9532f1e8cff5190baf7a4f23c27f67db4.tar.bz2
ls102xa: fdt: Disable IFC in SD boot for QSPI
As QSPI/DSPI and IFC are pin multiplexed, IFC is disabled in SD boot for QSPI. This patch will add fdt support for this rule. Signed-off-by: Alison Wang <alison.wang@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/armv7/ls102xa/fdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index e01d911..856abed 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -171,7 +171,7 @@ void ft_cpu_setup(void *blob, bd_t *bd)
do_fixup_by_compat_u32(blob, "fsl, ls1021a-flexcan",
"clock-frequency", busclk / 2, 1);
-#ifdef CONFIG_QSPI_BOOT
+#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
off = fdt_node_offset_by_compat_reg(blob, FSL_IFC_COMPAT,
CONFIG_SYS_IFC_ADDR);
fdt_set_node_status(blob, off, FDT_STATUS_DISABLED, 0);