From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Wed, 8 Jan 2020 16:12:31 +0000 (+0100)
Subject: ARM: dts: imx7: Fix Toradex Colibri iMX7S 256MB NAND flash support
X-Git-Tag: v5.5-rc7~27^2~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b0b97e651ecf29f20248420b52b6864fbd40bc2;p=thirdparty%2Flinux.git

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

Turns out when introducing the eMMC version the gpmi node required for
NAND flash support got enabled exclusively on Colibri iMX7D 512MB.

Fixes: f928a4a377e4 ("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>
---

diff --git a/arch/arm/boot/dts/imx7s-colibri.dtsi b/arch/arm/boot/dts/imx7s-colibri.dtsi
index 1fb1ec5d3d707..6d16e32aed899 100644
--- 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";
+};