Author: luka Date: 2015-11-18 23:06:50 +0100 (Wed, 18 Nov 2015) New Revision: 47510
Modified: trunk/target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch Log: 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 <[email protected]> Modified: trunk/target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch =================================================================== --- trunk/target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch 2015-11-18 21:36:36 UTC (rev 47509) +++ trunk/target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch 2015-11-18 22:06:50 UTC (rev 47510) @@ -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 @@ }; }; }; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
