aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-11-18 22:06:50 +0000
committerLuka Perkov <luka@openwrt.org>2015-11-18 22:06:50 +0000
commit1170f7b0b5b052e275ac15f69d33ab0aa6fe9ebf (patch)
tree364e13d9295435f830335a9ad4e5ed21c37a9847 /target/linux/imx6
parentc8bd3215a35593832654c48bc23d03c2abae4450 (diff)
downloadmaster-187ad058-1170f7b0b5b052e275ac15f69d33ab0aa6fe9ebf.tar.gz
master-187ad058-1170f7b0b5b052e275ac15f69d33ab0aa6fe9ebf.tar.bz2
master-187ad058-1170f7b0b5b052e275ac15f69d33ab0aa6fe9ebf.zip
imx6: ventana: fix GW16083 device-tree patch
The 206-ARM-imx-ventana-added-GW16083-to-device-tree.patch merged wrong in the conversion from 3.18 to 4.1. This patch resolves that and puts the device-tree nodes in the correct place. Signed-off-by: Tim Harvey <tharvey@gateworks.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47510 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/imx6')
-rw-r--r--target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch32
1 files changed, 16 insertions, 16 deletions
diff --git a/target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch b/target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch
index 6f31f956de..a9214d598f 100644
--- a/target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch
+++ b/target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch
@@ -1,9 +1,9 @@
--- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
-@@ -89,6 +89,11 @@
- enable-active-high;
- };
- };
+@@ -158,6 +158,11 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
+ status = "okay";
+
+ gw16083: gw16083@52 {
+ compatible = "gateworks,gw16083";
@@ -11,13 +11,13 @@
+ };
};
- &fec {
+ &i2c3 {
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
-@@ -266,6 +266,11 @@
- };
- };
- };
+@@ -233,6 +233,11 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
+ status = "okay";
+
+ gw16083: gw16083@52 {
+ compatible = "gateworks,gw16083";
@@ -25,13 +25,13 @@
+ };
};
- &pcie {
+ &i2c3 {
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
-@@ -267,6 +267,11 @@
- };
- };
- };
+@@ -226,6 +226,11 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
+ status = "okay";
+
+ gw16083: gw16083@52 {
+ compatible = "gateworks,gw16083";
@@ -39,10 +39,10 @@
+ };
};
- &pcie {
+ &i2c3 {
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
-@@ -308,6 +308,11 @@
+@@ -317,6 +317,11 @@
};
};
};