diff options
| author | Haibo Chen <haibo.chen@freescale.com> | 2015-06-12 17:22:12 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-09-17 09:23:40 -0500 |
| commit | da7fd66e1936d8a901472a818db05c631cd78a9d (patch) | |
| tree | 1780c9eb46615c84adc47c4898e25dfd737349a9 /arch/arm | |
| parent | e961988a47fe6b65ce6ec49ff067d6d01894690d (diff) | |
MLK-11100 ARM: dts: imx6ul-14x14-ddr3-arm2-emmc: disable qspi when use emmc
eMMC has pin conflict with qspi, so disable qspi when enable emmc on
imx6ul-14x14-ddr3-arm2 board.
Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-emmc.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-emmc.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-emmc.dts index 2e35ed6d353e..e1185ce38cdb 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-emmc.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-emmc.dts @@ -8,6 +8,10 @@ #include "imx6ul-14x14-ddr3-arm2.dts" +&qspi { + status = "disable"; +}; + &usdhc1 { pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc1_8bit>; |