aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorChristian Hemp <c.hemp@phytec.de>2014-11-14 14:32:23 +0100
committerAlex Shi <alex.shi@linaro.org>2015-11-13 14:02:36 +0800
commitf8c7c2d8e47530f140bf88bbbe2b672985734172 (patch)
tree2fb3c90934cac5a825d5f01e646b0e6ed3409e65 /arch
parenta576f42ee48d6fa0d5c5579cdfbeda0605453941 (diff)
ARM: dts: imx6: phyFLEX: Enable gpmi in module file
The nand is on the module (PFL-A-02) and not on the baseboard (PBA-B-01). Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> (cherry picked from commit 0019d18213924a9cd10fda59e2c8b83ece54fd58) Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi4
-rw-r--r--arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi2
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
index 6b2c8922877d..111b1f5021b9 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
@@ -105,10 +105,6 @@
status = "okay";
};
-&gpmi {
- status = "okay";
-};
-
&hdmi {
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index 9646ca2051c7..8e0e79087423 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -93,7 +93,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpmi_nand>;
nand-on-flash-bbt;
- status = "disabled";
+ status = "okay";
};
&i2c1 {