diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-02-20 17:26:10 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-02-20 17:26:10 +0000 |
| commit | 48d02a5a97e4d853b14d9663eb5def66ede80e63 (patch) | |
| tree | 0d0256e4f7adf38e45cbc655fbc31096ae739c99 /target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts | |
| parent | 91ea98bba889cf4bd86644677272208f401ebf5c (diff) | |
| download | upstream-48d02a5a97e4d853b14d9663eb5def66ede80e63.tar.gz upstream-48d02a5a97e4d853b14d9663eb5def66ede80e63.tar.bz2 upstream-48d02a5a97e4d853b14d9663eb5def66ede80e63.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39644 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.dts | 16 |
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"; }; |