ARM: dts: imx7: Fix Toradex Colibri iMX7S 256MB NAND flash support

commit 4b0b97e upstream. Turns out when introducing the eMMC version the gpmi node required for NAND flash support got enabled exclusively on Colibri iMX7D 512MB. Fixes: f928a4a ("ARM: dts: imx7: add Toradex Colibri iMX7D 1GB (eMMC) support") Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kakra · kakra · Jan 14, 2020 · Dec 18, 2019 · Dec 18, 2019 · Dec 18, 2019
commit 11675e1fa824e9860c59ac5dd298bf3f52c7a205
diff --git a/arch/arm/boot/dts/imx7s-colibri.dtsi b/arch/arm/boot/dts/imx7s-colibri.dtsi
@@ -49,3 +49,7 @@
 		reg = <0x80000000 0x10000000>;
 	};
 };
+
+&gpmi {
+	status = "okay";
+};
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,3 +49,7 @@ @@
     		reg = <0x80000000 0x10000000>;
     	};
     };
+    &gpmi {
+    	status = "okay";
+    };