rpcd: iwinfo plugin fixes

[openwrt/svn-archive/archive.git] / target / linux / ramips / dts / mt7620n.dtsi

diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi
index e886c6fbecc67f6a8ed0292245b3967876509925..6c5d66eaa812680c012fde7f40049308f49403a4 100644 (file)
--- a/target/linux/ramips/dts/mt7620n.dtsi
+++ b/target/linux/ramips/dts/mt7620n.dtsi
@@ -20,6 +20,12 @@
                compatible = "mti,cpu-interrupt-controller";
        };
 
+       aliases {
+               spi0 = &spi0;
+               spi1 = &spi1;
+               serial0 = &uartlite;
+       };
+
        palmbus@10000000 {
                compatible = "palmbus";
                reg = <0x10000000 0x200000>;
@@ -154,15 +160,15 @@
                        status = "disabled";
                };
 
-               spi@b00 {
+               spi0: spi@b00 {
                        compatible = "ralink,mt7620a-spi", "ralink,rt2880-spi";
-                       reg = <0xb00 0x100>;
+                       reg = <0xb00 0x40>;
 
                        resets = <&rstctrl 18>;
                        reset-names = "spi";
 
                        #address-cells = <1>;
-                       #size-cells = <1>;
+                       #size-cells = <0>;
 
                        status = "disabled";
 
@@ -170,7 +176,23 @@
                        pinctrl-0 = <&spi_pins>;
                };
 
-               uartlite@c00 {
+               spi1: spi@b40 {
+                       compatible = "ralink,rt2880-spi";
+                       reg = <0xb40 0x60>;
+
+                       resets = <&rstctrl 18>;
+                       reset-names = "spi";
+
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       status = "disabled";
+
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&spi_cs1>;
+               };
+
+               uartlite: uartlite@c00 {
                        compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
                        reg = <0xc00 0x100>;
 
@@ -213,6 +235,13 @@
                        };
                };
 
+               spi_cs1: spi1 {
+                       spi1 {
+                               ralink,group = "spi_cs1";
+                               ralink,function = "spi_cs1";
+                       };
+               };
+
                uartlite_pins: uartlite {
                        uart {
                                ralink,group = "uartlite";
@@ -227,7 +256,7 @@
        };
 
        usbphy: usbphy {
-               compatible = "ralink,mt7620a-usbphy";
+               compatible = "mediatek,mt7620-usbphy";
                #phy-cells = <1>;
 
                resets = <&rstctrl 22 &rstctrl 25>;
@@ -235,8 +264,8 @@
        };
 
        ethernet@10100000 {
-               compatible = "ralink,mt7620a-eth";
-               reg = <0x10100000 10000>;
+               compatible = "mediatek,mt7620-eth";
+               reg = <0x10100000 0x10000>;
 
                #address-cells = <1>;
                #size-cells = <0>;
@@ -247,6 +276,8 @@
                resets = <&rstctrl 21 &rstctrl 23>;
                reset-names = "fe", "esw";
 
+               mediatek,switch = <&gsw>;
+
                mdio-bus {
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -255,20 +286,20 @@
                };
        };
 
-       gsw@10110000 {
-               compatible = "ralink,mt7620a-gsw";
-               reg = <0x10110000 8000>;
+       gsw: gsw@10110000 {
+               compatible = "mediatek,mt7620-gsw";
+               reg = <0x10110000 0x8000>;
 
                resets = <&rstctrl 23>;
                reset-names = "esw";
 
                interrupt-parent = <&intc>;
                interrupts = <17>;
-               ralink,port4 = "gmac";
+               mediatek,port4 = "gmac";
        };
 
        ehci@101c0000 {
-               compatible = "ralink,rt3xxx-ehci";
+               compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
                interrupt-parent = <&intc>;
@@ -281,7 +312,7 @@
        };
 
        ohci@101c1000 {
-               compatible = "ralink,rt3xxx-ohci";
+               compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
                phys = <&usbphy 1>;
@@ -295,7 +326,7 @@
 
        wmac@10180000 {
                compatible = "ralink,rt7620-wmac", "ralink,rt2880-wmac";
-               reg = <0x10180000 40000>;
+               reg = <0x10180000 0x40000>;
 
                interrupt-parent = <&cpuintc>;
                interrupts = <6>;