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
This commit is contained in:
parent
5f3d29f4e6
commit
7b931ba95c
@ -1,9 +1,9 @@
|
|||||||
--- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
|
--- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
|
||||||
+++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
|
+++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
|
||||||
@@ -89,6 +89,11 @@
|
@@ -158,6 +158,11 @@
|
||||||
enable-active-high;
|
pinctrl-names = "default";
|
||||||
};
|
pinctrl-0 = <&pinctrl_i2c2>;
|
||||||
};
|
status = "okay";
|
||||||
+
|
+
|
||||||
+ gw16083: gw16083@52 {
|
+ gw16083: gw16083@52 {
|
||||||
+ compatible = "gateworks,gw16083";
|
+ compatible = "gateworks,gw16083";
|
||||||
@ -11,13 +11,13 @@
|
|||||||
+ };
|
+ };
|
||||||
};
|
};
|
||||||
|
|
||||||
&fec {
|
&i2c3 {
|
||||||
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
|
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
|
||||||
+++ b/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 {
|
+ gw16083: gw16083@52 {
|
||||||
+ compatible = "gateworks,gw16083";
|
+ compatible = "gateworks,gw16083";
|
||||||
@ -25,13 +25,13 @@
|
|||||||
+ };
|
+ };
|
||||||
};
|
};
|
||||||
|
|
||||||
&pcie {
|
&i2c3 {
|
||||||
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
|
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
|
||||||
+++ b/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 {
|
+ gw16083: gw16083@52 {
|
||||||
+ compatible = "gateworks,gw16083";
|
+ compatible = "gateworks,gw16083";
|
||||||
@ -39,10 +39,10 @@
|
|||||||
+ };
|
+ };
|
||||||
};
|
};
|
||||||
|
|
||||||
&pcie {
|
&i2c3 {
|
||||||
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
|
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
|
||||||
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
|
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
|
||||||
@@ -308,6 +308,11 @@
|
@@ -317,6 +317,11 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user