diff options
| author | Stefan Riedmueller <s.riedmueller@phytec.de> | 2019-07-09 09:19:23 +0200 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2019-07-23 13:38:32 +0800 |
| commit | 87dc2cd47989892b2374b43eda0a5f28c679ff2b (patch) | |
| tree | e5911d68066a5ecccb1c11d26faef2a33ba13c86 | |
| parent | f1da57d8ea3a9eeb0986fea22389402505d132e7 (diff) | |
| download | linux-87dc2cd47989892b2374b43eda0a5f28c679ff2b.tar.gz linux-87dc2cd47989892b2374b43eda0a5f28c679ff2b.tar.bz2 linux-87dc2cd47989892b2374b43eda0a5f28c679ff2b.zip | |
ARM: dts: imx6ul: segin: Only enable NAND if it is populated
The phyCORE-i.MX 6UL/ULL now comes either with NAND flash or eMMC. We
have to configure the populated memory type in the device tree files. So
the GPMI node gets disabled by default and only enabled if populated.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi index fee7a7e938ee..de6ffbb0183c 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi @@ -65,7 +65,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpmi_nand>; nand-on-flash-bbt; - status = "okay"; + status = "disabled"; }; &i2c1 { diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts index 81a82dd65019..c6ef13685a7c 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts +++ b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts @@ -50,6 +50,10 @@ status = "okay"; }; +&gpmi { + status = "okay"; +}; + &i2c_rtc { status = "okay"; }; |