rpcd: iwinfo plugin fixes

[openwrt/svn-archive/archive.git] / target / linux / ramips / dts / DIR-300-B1.dts

diff --git a/target/linux/ramips/dts/DIR-300-B1.dts b/target/linux/ramips/dts/DIR-300-B1.dts
index a9947f568cc94fc61ca9c80c7f1b9e9c92a7f8bd..8772ed4576f392903b017daee0749a0dd1f46147 100644 (file)
--- a/target/linux/ramips/dts/DIR-300-B1.dts
+++ b/target/linux/ramips/dts/DIR-300-B1.dts
@@ -1,32 +1,23 @@
 /dts-v1/;
 
-/include/ "rt3050.dtsi"
+#include "rt3050.dtsi"
 
 / {
        compatible = "DIR-300-B1", "ralink,rt3050-soc";
        model = "D-Link DIR-300 B1";
 
-       memorydetect {
-               ralink,memory = <0x0 0x200000 0x4000000>;
-       };
-
-       palmbus@10000000 {
-               sysc@0 {
-                       ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii";
-                       ralink,uartmux = "gpio";
-                       ralink,wdtmux = <1>;
+       pinctrl {
+               state_default: pinctrl0 {
+                       gpio {
+                               ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+                               ralink,function = "gpio";
+                       };
                };
-
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
        };
 
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
-
                bank-width = <2>;
                device-width = <2>;
                #address-cells = <1>;
@@ -38,13 +29,13 @@
                        read-only;
                };
 
-               partition@30000 {
+               devdata: partition@30000 {
                        label = "devdata";
                        reg = <0x30000 0x10000>;
                        read-only;
                };
 
-               partition@40000 {
+               factory: partition@40000 {
                        label = "devconf";
                        reg = <0x40000 0x10000>;
                        read-only;
@@ -57,12 +48,15 @@
        };
 
        ethernet@10100000 {
-               status = "okay";
+               mtd-mac-address = <&devdata 0x4004>;
        };
 
        esw@10110000 {
-               status = "okay";
-               ralink,portmap = <0x2f>;
+               mediatek,portmap = <0x2f>;
+       };
+
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&devdata 0x4000>;
        };
 
        gpio-keys-polled {
@@ -70,11 +64,13 @@
                #address-cells = <1>;
                #size-cells = <0>;
                poll-interval = <20>;
+
                reset {
                        label = "reset";
                        gpios = <&gpio0 10 1>;
                        linux,code = <0x198>;
                };
+
                wps {
                        label = "wps";
                        gpios = <&gpio0 0 1>;
@@ -82,30 +78,31 @@
                };
        };
 
-       wmac@10180000 {
-               status = "okay";
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
+
                status {
-                       label = "d-link:amber:status";
+                       label = "dir-300-b1:amber:status";
                        gpios = <&gpio0 8 1>;
                };
+
                status2 {
-                       label = "d-link:green:status";
+                       label = "dir-300-b1:green:status";
                        gpios = <&gpio0 9 1>;
                };
+
                wan {
-                       label = "d-link:amber:wan";
+                       label = "dir-300-b1:amber:wan";
                        gpios = <&gpio0 14 1>;
                };
+
                wan2 {
-                       label = "d-link:green:wan";
+                       label = "dir-300-b1:green:wan";
                        gpios = <&gpio0 12 1>;
                };
+
                wps {
-                       label = "d-link:blue:wps";
+                       label = "dir-300-b1:blue:wps";
                        gpios = <&gpio0 13 1>;
                };
        };