rpcd: iwinfo plugin fixes

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

diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi
index e4d35d87c23fa566db37223b1a74b01c8ea9547e..a22af421128b97b7dfa00bb91a8085aefde916f6 100644 (file)
--- a/target/linux/ramips/dts/rt3352.dtsi
+++ b/target/linux/ramips/dts/rt3352.dtsi
@@ -20,6 +20,12 @@
                compatible = "mti,cpu-interrupt-controller";
        };
 
+       aliases {
+               spi0 = &spi0;
+               spi1 = &spi1;
+               serial0 = &uartlite;
+       };
+
        palmbus@10000000 {
                compatible = "palmbus";
                reg = <0x10000000 0x200000>;
@@ -106,8 +112,6 @@
 
                        interrupt-parent = <&intc>;
                        interrupts = <6>;
-
-                       status = "disabled";
                };
 
                gpio1: gpio@638 {
@@ -134,7 +138,7 @@
                        #gpio-cells = <2>;
 
                        ralink,gpio-base = <40>;
-                       ralink,num-gpios = <12>;
+                       ralink,num-gpios = <6>;
                        ralink,register-map = [ 00 04 08 0c
                                                10 14 18 1c
                                                20 24 ];
@@ -142,19 +146,37 @@
                        status = "disabled";
                };
 
-               spi@b00 {
+               spi0: spi@b00 {
                        compatible = "ralink,rt3352-spi", "ralink,rt2880-spi";
-                       reg = <0xb00 0x100>;
+                       reg = <0xb00 0x40>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       resets = <&rstctrl 18>;
+                       reset-names = "spi";
+
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&spi_pins>;
+
+                       status = "disabled";
+               };
+
+               spi1: spi@b40 {
+                       compatible = "ralink,rt3352-spi", "ralink,rt2880-spi";
+                       reg = <0xb40 0x60>;
                        #address-cells = <1>;
                        #size-cells = <1>;
 
                        resets = <&rstctrl 18>;
                        reset-names = "spi";
-       
+
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&spi_cs1>;
+
                        status = "disabled";
                };
 
-               uartlite@c00 {
+               uartlite: uartlite@c00 {
                        compatible = "ralink,rt3352-uart", "ralink,rt2880-uart", "ns16550a";
                        reg = <0xc00 0x100>;
 
@@ -165,6 +187,40 @@
                        interrupts = <12>;
 
                        reg-shift = <2>;
+
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&uartlite_pins>;
+               };
+       };
+
+       pinctrl {
+               compatible = "ralink,rt2880-pinmux";
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&state_default>;
+
+               state_default: pinctrl0 {
+               };
+
+               spi_pins: spi {
+                       spi {
+                               ralink,group = "spi";
+                               ralink,function = "spi";
+                       };
+               };
+
+               spi_cs1: spi1 {
+                       spi1 {
+                               ralink,group = "spi_cs1";
+                               ralink,function = "spi_cs1";
+                       };
+               };
+
+               uartlite_pins: uartlite {
+                       uart {
+                               ralink,group = "uartlite";
+                               ralink,function = "uartlite";
+                       };
                };
        };
 
@@ -175,40 +231,53 @@
 
        ethernet@10100000 {
                compatible = "ralink,rt3352-eth", "ralink,rt3050-eth";
-               reg = <0x10100000 10000>;
+               reg = <0x10100000 0x10000>;
+
+               resets = <&rstctrl 21>;
+               reset-names = "fe";
 
                interrupt-parent = <&cpuintc>;
                interrupts = <5>;
 
-               status = "disabled";
+               mediatek,switch = <&esw>;
        };
 
-       esw@10110000 {
+       esw: esw@10110000 {
                compatible = "ralink,rt3352-esw", "ralink,rt3050-esw";
-               reg = <0x10110000 8000>;
+               reg = <0x10110000 0x8000>;
+
+               resets = <&rstctrl 23>;
+               reset-names = "esw";
 
                interrupt-parent = <&intc>;
                interrupts = <17>;
+       };
 
-               status = "disabled";
+       usbphy: usbphy {
+               compatible = "ralink,rt3352-usbphy";
+               #phy-cells = <1>;
+
+               resets = <&rstctrl 22 &rstctrl 25>;
+               reset-names = "host", "device";
        };
 
        wmac@10180000 {
                compatible = "ralink,rt3352-wmac", "ralink,rt2880-wmac";
-               reg = <0x10180000 40000>;
+               reg = <0x10180000 0x40000>;
 
                interrupt-parent = <&cpuintc>;
                interrupts = <6>;
 
                ralink,eeprom = "soc_wmac.eeprom";
-
-               status = "disabled";
        };
 
        ehci@101c0000 {
-               compatible = "ralink,rt3352-ehci", "ehci-platform";
+               compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
+               phys = <&usbphy 1>;
+               phy-names = "usb";
+
                interrupt-parent = <&intc>;
                interrupts = <18>;
 
@@ -216,9 +285,12 @@
        };
 
        ohci@101c1000 {
-               compatible = "ralink,rt3352-ohci", "ohci-platform";
+               compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
+               phys = <&usbphy 1>;
+               phy-names = "usb";
+
                interrupt-parent = <&intc>;
                interrupts = <18>;