From 021cf95329dc64a5f4d17ebe993c6daf9ec7a4f7 Mon Sep 17 00:00:00 2001 From: Han Xu Date: Mon, 9 May 2016 17:36:01 -0500 Subject: [PATCH] MLK-12769: ARM: dts: fix the optional QSPI pin conflict with SD2 The optional QSPI pin should be only enabled on reworked board, fix the issue which conflict with SD2. Signed-off-by: Han Xu --- arch/arm/boot/dts/imx6ull-ddr3-arm2.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2.dts b/arch/arm/boot/dts/imx6ull-ddr3-arm2.dts index 0e3f475ded2c..ea2a79750216 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2.dts +++ b/arch/arm/boot/dts/imx6ull-ddr3-arm2.dts @@ -666,6 +666,7 @@ MX6UL_PAD_NAND_CE1_B__QSPI_A_DATA02 0x70a1 MX6UL_PAD_NAND_CLE__QSPI_A_DATA03 0x70a1 MX6UL_PAD_NAND_DQS__QSPI_A_SS0_B 0x70a1 +#ifdef REWORKED_ENABLE_ALL_QSPI MX6UL_PAD_NAND_DATA07__QSPI_A_SS1_B 0x70a1 MX6UL_PAD_NAND_RE_B__QSPI_B_SCLK 0x70a1 MX6UL_PAD_NAND_DATA02__QSPI_B_DATA00 0x70a1 @@ -674,6 +675,7 @@ MX6UL_PAD_NAND_DATA05__QSPI_B_DATA03 0x70a1 MX6UL_PAD_NAND_WE_B__QSPI_B_SS0_B 0x70a1 MX6UL_PAD_NAND_DATA00__QSPI_B_SS1_B 0x70a1 +#endif >; }; -- 2.17.1