generic: 4.4: refresh patches

[openwrt.git] / target / linux / ramips / dts / WHR-600D.dts

diff --git a/target/linux/ramips/dts/WHR-600D.dts b/target/linux/ramips/dts/WHR-600D.dts
index 5775093..3173342 100644 (file)
--- a/target/linux/ramips/dts/WHR-600D.dts
+++ b/target/linux/ramips/dts/WHR-600D.dts
@@ -17,7 +17,7 @@
                        m25p80@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "en25q64";
+                               compatible = "jedec,spi-nor";
                                reg = <0 0>;
                                linux,modalias = "m25p80", "mx25l6405d";
                                spi-max-frequency = <10000000>;
@@ -60,13 +60,12 @@
        ethernet@10100000 {
                pinctrl-names = "default";
                pinctrl-0 = <&ephy_pins>;
-
                mtd-mac-address = <&factory 0x4>;
-               ralink,port-map = "llllw";
+               mediatek,portmap = "llllw";
        };
 
        gsw@10110000 {
-               ralink,port4 = "ephy";
+               mediatek,port4 = "ephy";
        };
 
        wmac@10180000 {
@@ -76,35 +75,42 @@
        pcie@10140000 {
                status = "okay";
        };
-       
+
        gpio-leds {
                compatible = "gpio-leds";
+
                power {
-                       label = "buffalo:red:power";
+                       label = "whr-600d:red:power";
                        gpios = <&gpio0 7 1>;
                };
+
                wifi {
-                       label = "buffalo:green:wifi";
+                       label = "whr-600d:green:wifi";
                        gpios = <&gpio0 8 1>;
                };
+
                power2 {
-                       label = "buffalo:green:power";
+                       label = "whr-600d:green:power";
                        gpios = <&gpio0 9 1>;
                };
+
                wifi2 {
-                       label = "buffalo:orange:wifi";
+                       label = "whr-600d:orange:wifi";
                        gpios = <&gpio0 10 1>;
                };
+
                internet {
-                       label = "buffalo:green:internet";
+                       label = "whr-600d:green:internet";
                        gpios = <&gpio2 17 1>;
                };
+
                router {
-                       label = "buffalo:green:router";
+                       label = "whr-600d:green:router";
                        gpios = <&gpio2 18 1>;
                };
+
                router2 {
-                       label = "buffalo:orange:router";
+                       label = "whr-600d:orange:router";
                        gpios = <&gpio2 19 1>;
                };
        };
@@ -114,22 +120,26 @@
                #address-cells = <1>;
                #size-cells = <0>;
                poll-interval = <20>;
+
                reset {
                        label = "reset";
                        gpios = <&gpio2 12 1>;
                        linux,code = <0x198>;
                };
+
                aoss {
                        label = "aoss";
                        gpios = <&gpio2 13 1>;
                        linux,code = <0x211>;
                };
+
                ap {
                        label = "ap";
                        gpios = <&gpio2 14 1>;
                        linux,code = <0x100>;
                        linux,input-type = <5>; /* EV_SW */
                };
+
                bridge {
                        label = "bridge";
                        gpios = <&gpio2 15 1>;