aboutsummaryrefslogtreecommitdiffstats
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
commit7b931ba95c8e8bcf268f24c85bd1e73333b1f99f (patch)
tree8042bce98c42f21a6d5feb5aea3347965dcfd9c5
parent5f3d29f4e69db9cca1c65310c7ad6963f2e0aa02 (diff)
downloadupstream-7b931ba95c8e8bcf268f24c85bd1e73333b1f99f.tar.gz
upstream-7b931ba95c8e8bcf268f24c85bd1e73333b1f99f.tar.bz2
upstream-7b931ba95c8e8bcf268f24c85bd1e73333b1f99f.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> SVN-Revision: 47510
-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 @@
};
};
};