aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-02-20 17:26:10 +0000
committerLuka Perkov <luka@openwrt.org>2014-02-20 17:26:10 +0000
commit223c6808baba3af4fde888b5a14196af99ebec4b (patch)
tree44b3e57c000540137f069c9766f93d21ebec598a /target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts
parenta52100469f7f0544640f2914d66c68631787bddf (diff)
downloadupstream-223c6808baba3af4fde888b5a14196af99ebec4b.tar.gz
upstream-223c6808baba3af4fde888b5a14196af99ebec4b.tar.bz2
upstream-223c6808baba3af4fde888b5a14196af99ebec4b.zip
imx6: update Ventana dts
Update the Ventana device-tree to match upstream: - Add IMX6Q/IMX6DL variants for GW54xx/GW53xx/GW52xx/GW51xx - align pinctrl with upstream - consolidate multiple patches into one Signed-off-by: Tim Harvey <tharvey@gateworks.com> SVN-Revision: 39644
Diffstat (limited to 'target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts')
-rw-r--r--target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts16
1 files changed, 5 insertions, 11 deletions
diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts
index 825d952ba2..9677135840 100644
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts
@@ -38,10 +38,6 @@
bootargs = "console=ttymxc1,115200";
};
- memory {
- reg = <0x10000000 0x40000000>;
- };
-
leds {
compatible = "gpio-leds";
@@ -65,6 +61,10 @@
};
};
+ memory {
+ reg = <0x10000000 0x40000000>;
+ };
+
regulators {
compatible = "simple-bus";
@@ -406,13 +406,7 @@
&uart2 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart2_2>;
- status = "okay";
-};
-
-&uart3 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart3_1>;
+ pinctrl-0 = <&pinctrl_uart2_3>;
status = "okay";
};