summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx7s-colibri.dtsi
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2020-01-08 17:12:31 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-23 08:22:43 +0100
commit11675e1fa824e9860c59ac5dd298bf3f52c7a205 (patch)
treebe5837d23352b14a68b632c414bd85d2f317f2ef /arch/arm/boot/dts/imx7s-colibri.dtsi
parent34218ec83947a467d6c217af4e92f0a413c7dce6 (diff)
ARM: dts: imx7: Fix Toradex Colibri iMX7S 256MB NAND flash support
commit 4b0b97e651ecf29f20248420b52b6864fbd40bc2 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/imx7s-colibri.dtsi')
-rw-r--r--arch/arm/boot/dts/imx7s-colibri.dtsi4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx7s-colibri.dtsi b/arch/arm/boot/dts/imx7s-colibri.dtsi
index 1fb1ec5d3d70..6d16e32aed89 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";
+};