zynq: dtses: Fix usb, enet and i2c reset description

Origin MIO connection just pointed to ps7_gpio controller
which is handling it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index f4c18db3378aeb9c6b6905b1322df0bb1c20d69d..d6840b3a15fcb530e90a6b12530a6bb267653a41 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -126,13 +126,13 @@
                        clock-names = "ref_clk", "aper_clk";
                        clocks = <&clkc 13>, <&clkc 30>;
                        compatible = "xlnx,ps7-ethernet-1.00.a";
+                       enet-reset = <&ps7_gpio_0 11 0>;
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 22 4>;
                        local-mac-address = [00 0a 35 00 00 00];
                        phy-handle = <&phy0>;
                        phy-mode = "rgmii-id";
                        reg = <0xe000b000 0x1000>;
-                       xlnx,enet-reset = "MIO 11";
                        xlnx,eth-mode = <0x1>;
                        xlnx,has-mdio = <0x1>;
                        xlnx,ptp-enet-clock = <111111115>;
@@ -163,11 +163,11 @@
                        clocks = <&clkc 38>;
                        compatible = "xlnx,ps7-i2c-1.00.a";
                        i2c-clk = <400000>;
+                       i2c-reset = <&ps7_gpio_0 13 0>;
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 25 4>;
                        reg = <0xe0004000 0x1000>;
                        xlnx,has-interrupt = <0x0>;
-                       xlnx,i2c-reset = "MIO 13";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        i2cswitch@74 {
@@ -399,7 +399,7 @@
                        interrupts = <0 21 4>;
                        phy_type = "ulpi";
                        reg = <0xe0002000 0x1000>;
-                       xlnx,usb-reset = "MIO 7";
+                       usb-reset = <&ps7_gpio_0 7 0>;
                } ;
                ps7_wdt_0: ps7-wdt@f8005000 {
                        clocks = <&clkc 45>;

diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index a7912fb582204e2deda20275e7f13b05312a349a..7a6d7e80d77692fa2ac8a3ceb81a8c417016cbe2 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -118,13 +118,13 @@
                        clock-names = "ref_clk", "aper_clk";
                        clocks = <&clkc 13>, <&clkc 30>;
                        compatible = "xlnx,ps7-ethernet-1.00.a";
+                       enet-reset = <&ps7_gpio_0 47 0>;
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 22 4>;
                        local-mac-address = [00 0a 35 00 00 00];
                        phy-handle = <&phy0>;
                        phy-mode = "rgmii-id";
                        reg = <0xe000b000 0x1000>;
-                       xlnx,enet-reset = "MIO 47";
                        xlnx,eth-mode = <0x1>;
                        xlnx,has-mdio = <0x1>;
                        xlnx,ptp-enet-clock = <111111115>;
@@ -155,11 +155,11 @@
                        clocks = <&clkc 38>;
                        compatible = "xlnx,ps7-i2c-1.00.a";
                        i2c-clk = <400000>;
+                       i2c-reset = <&ps7_gpio_0 46 0>;
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 25 4>;
                        reg = <0xe0004000 0x1000>;
                        xlnx,has-interrupt = <0x0>;
-                       xlnx,i2c-reset = "MIO 46";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        i2cswitch@74 {
@@ -392,7 +392,7 @@
                        interrupts = <0 21 4>;
                        phy_type = "ulpi";
                        reg = <0xe0002000 0x1000>;
-                       xlnx,usb-reset = "MIO 7";
+                       usb-reset = <&ps7_gpio_0 7 0>;
                } ;
                ps7_wdt_0: ps7-wdt@f8005000 {
                        clocks = <&clkc 45>;

diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index dfca0d968968c700ca40a64d76f56df0f51894ec..7db3291a2d5327fca1d74d0af8510f9bcb041584 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -133,7 +133,6 @@
                        phy-handle = <&phy0>;
                        phy-mode = "rgmii-id";
                        reg = <0xe000b000 0x1000>;
-                       xlnx,enet-reset = <0xffffffff>;
                        xlnx,eth-mode = <0x1>;
                        xlnx,has-mdio = <0x1>;
                        xlnx,ptp-enet-clock = <111111115>;
@@ -168,7 +167,6 @@
                        interrupts = <0 25 4>;
                        reg = <0xe0004000 0x1000>;
                        xlnx,has-interrupt = <0x0>;
-                       xlnx,i2c-reset = <0xffffffff>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        m24c02_eeprom@52 {
@@ -357,7 +355,7 @@
                        interrupts = <0 21 4>;
                        phy_type = "ulpi";
                        reg = <0xe0002000 0x1000>;
-                       xlnx,usb-reset = "MIO 7";
+                       usb-reset = <&ps7_gpio_0 7 0>;
                } ;
                ps7_wdt_0: ps7-wdt@f8005000 {
                        clocks = <&clkc 45>;

diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index b945bfa064743d53a764577b675944835d265fc8..28367c34aec03dd399bea247748c5f0f115aa55c 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -307,7 +307,6 @@
                        interrupts = <0 44 4>;
                        phy_type = "ulpi";
                        reg = <0xe0003000 0x1000>;
-                       xlnx,usb-reset = <0xffffffff>;
                } ;
                ps7_wdt_0: ps7-wdt@f8005000 {
                        clocks = <&clkc 45>;

diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts b/arch/arm/boot/dts/zynq-zc770-xm012.dts
index a93aaa41fe95628d5aa094f2403ca7e11732af06..fa2afc422d43d6ceeb1fda30814be825c6574539 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -141,7 +141,6 @@
                        interrupts = <0 25 4>;
                        reg = <0xe0004000 0x1000>;
                        xlnx,has-interrupt = <0x0>;
-                       xlnx,i2c-reset = <0xffffffff>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        m24c02_eeprom@52 {

diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts b/arch/arm/boot/dts/zynq-zc770-xm013.dts
index 5c50f590adcfb335e1a201913649886aa0abb6c5..c7129bfdd3f7e0f335c47ad75e1896c6d8dbacc1 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts
@@ -133,7 +133,6 @@
                        phy-handle = <&phy0>;
                        phy-mode = "rgmii-id";
                        reg = <0xe000c000 0x1000>;
-                       xlnx,enet-reset = <0xffffffff>;
                        xlnx,eth-mode = <0x1>;
                        xlnx,has-mdio = <0x1>;
                        xlnx,ptp-enet-clock = <111111115>;

diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 0226a7433202e189bf3cc33c70acfac153cd156e..ecacadbba68e659f67b5d410db0f521169c569e4 100644 (file)
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -123,7 +123,6 @@
                        phy-handle = <&phy0>;
                        phy-mode = "rgmii-id";
                        reg = <0xe000b000 0x1000>;
-                       xlnx,enet-reset = <0xffffffff>;
                        xlnx,eth-mode = <0x1>;
                        xlnx,has-mdio = <0x1>;
                        xlnx,ptp-enet-clock = <111111115>;
@@ -306,7 +305,6 @@
                        interrupts = <0 21 4>;
                        phy_type = "ulpi";
                        reg = <0xe0002000 0x1000>;
-                       xlnx,usb-reset = <0xffffffff>;
                } ;
                ps7_xadc: ps7-xadc@f8007100 {
                        clocks = <&clkc 12>;