]> git.sur5r.net Git - u-boot/commitdiff
ls102xa: fdt: Disable IFC in SD boot for QSPI
authorAlison Wang <b18965@freescale.com>
Wed, 28 Oct 2015 02:40:23 +0000 (10:40 +0800)
committerYork Sun <yorksun@freescale.com>
Thu, 29 Oct 2015 17:33:56 +0000 (10:33 -0700)
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>
arch/arm/cpu/armv7/ls102xa/fdt.c

index e01d91178054e7920219d3117ea95e1b8ce98976..856abed94182ce741643a40bbe286bf613f97977 100644 (file)
@@ -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);