diff mbox

[U-Boot] ls102xa: fdt: Disable IFC in SD boot for QSPI

Message ID 1446000023-34819-1-git-send-email-b18965@freescale.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

Alison Wang Oct. 28, 2015, 2:40 a.m. UTC 
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>
---
 arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

York Sun Oct. 30, 2015, 4:13 p.m. UTC | #1 
On 10/27/2015 07:40 PM, Alison Wang wrote:
> 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>
> ---


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

York
diff mbox

Patch

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