summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hemp <c.hemp@phytec.de>2014-11-14 14:32:23 +0100
committerShawn Guo <shawn.guo@linaro.org>2014-11-19 11:59:06 +0800
commit1f79f3662b4e72c09e4ae4db97d592cc460e3310 (patch)
tree17e63c9a8ba241d6e728053e9b79a4a62dbcd6ce
parente18c9f022839a12c9f83438ff5faaa4ce3a896c9 (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>
-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 585b823eb0e0..af3065336969 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -91,7 +91,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpmi_nand>;
nand-on-flash-bbt;
- status = "disabled";
+ status = "okay";
};
&i2c1 {