From 173a86970199bfb5fa39f944a329a3cee3ce7673 Mon Sep 17 00:00:00 2001 From: Allen Xu Date: Fri, 30 Jan 2015 01:57:44 +0800 Subject: [PATCH] MLK-10189: ARM:dts: disable gpmi nand module in imx6qdl sabreauto dts disable gpmi nand module in imx6qdl default dts since it conflicts with uart3 Signed-off-by: Allen Xu (cherry picked from commit 54105e0ad2a4e30c5c048b5b9b233e49b4fba47d) --- arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index 773eb695c1b9..3c79d8701b76 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -348,7 +348,7 @@ &gpmi { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpmi_nand>; - status = "okay"; + status = "disabled"; /* pin conflict with uart3 */ nand-on-flash-bbt; }; -- 2.17.1