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
--- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
--- 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";
+
+ gw16083: gw16083@52 {
+ compatible = "gateworks,gw16083";
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
--- 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";
+
+ gw16083: gw16083@52 {
+ compatible = "gateworks,gw16083";
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
--- 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";
+
+ gw16083: gw16083@52 {
+ compatible = "gateworks,gw16083";
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi