ramips: reset mt7620 ethernet phy via reset controller

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7620a.dtsi

diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi
index c33dd135fef11b736ea40819a6ea1e7f9b5db43c..0fa503e7a2c099a72bea6ee0dbcc8404dc92746d 100644 (file)
--- a/target/linux/ramips/dts/mt7620a.dtsi
+++ b/target/linux/ramips/dts/mt7620a.dtsi
@@ -40,15 +40,19 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
-               sysc: sysc@0 {
-                       compatible = "ralink,mt7620a-sysc", "ralink,rt3050-sysc", "syscon";
+               sysc: syscon@0 {
+                       compatible = "ralink,mt7620-sysc", "syscon";
                        reg = <0x0 0x100>;
+                       #clock-cells = <1>;
+                       #reset-cells = <1>;
                };
 
                timer: timer@100 {
                        compatible = "ralink,mt7620a-timer", "ralink,rt2880-timer";
                        reg = <0x100 0x20>;
 
+                       clocks = <&sysc 5>;
+
                        interrupt-parent = <&intc>;
                        interrupts = <1>;
                };
@@ -57,7 +61,9 @@
                        compatible = "ralink,mt7620a-wdt", "ralink,rt2880-wdt";
                        reg = <0x120 0x10>;
 
-                       resets = <&rstctrl 8>;
+                       clocks = <&sysc 6>;
+
+                       resets = <&sysc 8>;
                        reset-names = "wdt";
 
                        interrupt-parent = <&intc>;
@@ -68,9 +74,6 @@
                        compatible = "ralink,mt7620a-intc", "ralink,rt2880-intc";
                        reg = <0x200 0x100>;
 
-                       resets = <&rstctrl 19>;
-                       reset-names = "intc";
-
                        interrupt-controller;
                        #interrupt-cells = <1>;
 
@@ -82,9 +85,6 @@
                        compatible = "ralink,mt7620a-memc", "ralink,rt3050-memc";
                        reg = <0x300 0x100>;
 
-                       resets = <&rstctrl 20>;
-                       reset-names = "mc";
-
                        interrupt-parent = <&intc>;
                        interrupts = <3>;
                };
@@ -93,8 +93,9 @@
                        compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
                        reg = <0x500 0x100>;
 
-                       resets = <&rstctrl 12>;
-                       reset-names = "uart";
+                       clocks = <&sysc 7>;
+
+                       resets = <&sysc 12>;
 
                        interrupt-parent = <&intc>;
                        interrupts = <5>;
@@ -108,9 +109,6 @@
                        compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
                        reg = <0x600 0x34>;
 
-                       resets = <&rstctrl 13>;
-                       reset-names = "pio";
-
                        interrupt-parent = <&intc>;
                        interrupts = <6>;
 
@@ -185,7 +183,9 @@
                        compatible = "ralink,rt2880-i2c";
                        reg = <0x900 0x100>;
 
-                       resets = <&rstctrl 16>;
+                       clocks = <&sysc 8>;
+
+                       resets = <&sysc 16>;
                        reset-names = "i2c";
 
                        #address-cells = <1>;
@@ -201,7 +201,9 @@
                        compatible = "mediatek,mt7620-i2s";
                        reg = <0xa00 0x100>;
 
-                       resets = <&rstctrl 17>;
+                       clocks = <&sysc 9>;
+
+                       resets = <&sysc 17>;
                        reset-names = "i2s";
 
                        interrupt-parent = <&intc>;
@@ -221,7 +223,9 @@
                        compatible = "ralink,mt7620a-spi", "ralink,rt2880-spi";
                        reg = <0xb00 0x40>;
 
-                       resets = <&rstctrl 18>;
+                       clocks = <&sysc 10>;
+
+                       resets = <&sysc 18>;
                        reset-names = "spi";
 
                        #address-cells = <1>;
@@ -237,7 +241,9 @@
                        compatible = "ralink,rt2880-spi";
                        reg = <0xb40 0x60>;
 
-                       resets = <&rstctrl 18>;
+                       clocks = <&sysc 11>;
+
+                       resets = <&sysc 18>;
                        reset-names = "spi";
 
                        #address-cells = <1>;
@@ -253,8 +259,9 @@
                        compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
                        reg = <0xc00 0x100>;
 
-                       resets = <&rstctrl 19>;
-                       reset-names = "uartl";
+                       clocks = <&sysc 12>;
+
+                       resets = <&sysc 19>;
 
                        interrupt-parent = <&intc>;
                        interrupts = <12>;
@@ -269,9 +276,6 @@
                        compatible = "ralink,mt7620a-systick", "ralink,cevt-systick";
                        reg = <0xd00 0x10>;
 
-                       resets = <&rstctrl 28>;
-                       reset-names = "intc";
-
                        interrupt-parent = <&cpuintc>;
                        interrupts = <7>;
                };
@@ -280,7 +284,7 @@
                        compatible = "ralink,mt7620a-pcm";
                        reg = <0x2000 0x800>;
 
-                       resets = <&rstctrl 11>;
+                       resets = <&sysc 11>;
                        reset-names = "pcm";
 
                        interrupt-parent = <&intc>;
@@ -293,7 +297,7 @@
                        compatible = "ralink,mt7620a-gdma", "ralink,rt3883-gdma";
                        reg = <0x2800 0x800>;
 
-                       resets = <&rstctrl 14>;
+                       resets = <&sysc 14>;
                        reset-names = "dma";
 
                        interrupt-parent = <&intc>;
@@ -420,6 +424,13 @@
                        };
                };
 
+               pa_gpio_pins: pa_gpio {
+                       pa {
+                               groups = "pa";
+                               function = "gpio";
+                       };
+               };
+
                sdhci_pins: sdhci {
                        sdhci {
                                groups = "nd_sd";
@@ -428,26 +439,14 @@
                };
        };
 
-       rstctrl: rstctrl {
-               compatible = "ralink,mt7620a-reset", "ralink,rt2880-reset";
-               #reset-cells = <1>;
-       };
-
-       clkctrl: clkctrl {
-               compatible = "ralink,rt2880-clock";
-               #clock-cells = <1>;
-       };
-
        usbphy: usbphy {
                compatible = "mediatek,mt7620-usbphy";
                #phy-cells = <0>;
 
                ralink,sysctl = <&sysc>;
-               resets = <&rstctrl 22 &rstctrl 25>;
+               /* usb phy reset is only controled by RSTCTRL bit 25 */
+               resets = <&sysc 25>, <&sysc 22>;
                reset-names = "host", "device";
-
-               clocks = <&clkctrl 22 &clkctrl 25>;
-               clock-names = "host", "device";
        };
 
        ethernet: ethernet@10100000 {
@@ -460,7 +459,7 @@
                interrupt-parent = <&cpuintc>;
                interrupts = <5>;
 
-               resets = <&rstctrl 21 &rstctrl 23>;
+               resets = <&sysc 21>, <&sysc 23>;
                reset-names = "fe", "esw";
 
                mediatek,switch = <&gsw>;
@@ -491,8 +490,8 @@
                compatible = "mediatek,mt7620-gsw";
                reg = <0x10110000 0x8000>;
 
-               resets = <&rstctrl 23>;
-               reset-names = "esw";
+               resets = <&sysc 24>;
+               reset-names = "ephy";
 
                interrupt-parent = <&intc>;
                interrupts = <17>;
@@ -559,12 +558,9 @@
                #address-cells = <3>;
                #size-cells = <2>;
 
-               resets = <&rstctrl 26>;
+               resets = <&sysc 26>;
                reset-names = "pcie0";
 
-               clocks = <&clkctrl 26>;
-               clock-names = "pcie0";
-
                interrupt-parent = <&cpuintc>;
                interrupts = <4>;
 
@@ -597,6 +593,8 @@
                compatible = "ralink,rt7620-wmac", "ralink,rt2880-wmac";
                reg = <0x10180000 0x40000>;
 
+               clocks = <&sysc 13>;
+
                interrupt-parent = <&cpuintc>;
                interrupts = <6>;