| From 39008e0d957c2c6cacd36d1837c2f0cdd54853bb Mon Sep 17 00:00:00 2001 |
| From: Marcel Ziswiler <marcel.ziswiler@toradex.com> |
| Date: Wed, 8 Jan 2020 17:12:31 +0100 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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"; |
| +}; |
| -- |
| 2.7.4 |
| |
