ramips: update DTS files to use jedec,spi-nor compatible string for m25p80 to fix...

[openwrt/staging/florian.git] / target / linux / ramips / dts / DIR-610-A1.dts

diff --git a/target/linux/ramips/dts/DIR-610-A1.dts b/target/linux/ramips/dts/DIR-610-A1.dts
index ed5606af89a0931ecb0c6ed9cfe793e2775eb39b..cfab89ae1dcae069c2655358d256fd3887ba2acb 100644 (file)
--- a/target/linux/ramips/dts/DIR-610-A1.dts
+++ b/target/linux/ramips/dts/DIR-610-A1.dts
@@ -5,24 +5,15 @@
 / {
        compatible = "DIR-610-A1", "ralink,rt5350-soc";
        model = "D-Link DIR-610 A1";
-       
-       palmbus@10000000 {
-               sysc@0 {
-                       ralink,pinmux = "i2c", "spi", "jtag", "uartlite", "mdio", "sdram", "rgmii";
-                       ralink,uartmux = "gpio";
-                       ralink,wdtmux = <1>;
-               };
-
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
 
+       palmbus@10000000 {
                spi@b00 {
                        status = "okay";
+
                        m25p80@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "f25l32pa", "m25p80";
+                               compatible = "jedec,spi-nor";
                                reg = <0 0>;
                                linux,modalias = "m25p80";
                                spi-max-frequency = <10000000>;
@@ -33,10 +24,10 @@
                                        read-only;
                                };
 
-                               partition@30000 {
+                               devdata: partition@30000 {
                                        label = "devdata";
                                        reg = <0x30000 0x10000>;
-                                       read-only;
+                                       read-only;
                                };
 
                                factory: partition@40000 {
@@ -53,48 +44,61 @@
                };
        };
 
+       pinctrl {
+               state_default: pinctrl0 {
+                       gpio {
+                               ralink,group = "i2c", "jtag", "uartf";
+                               ralink,function = "gpio";
+                       };
+               };
+       };
+
        ethernet@10100000 {
-               status = "okay";
+               mtd-mac-address = <&devdata 0x4004>;
        };
 
        esw@10110000 {
                status = "okay";
-               ralink,portmap = <0x1f>;
-               ralink,led-polarity = <0>;
+               mediatek,portmap = <0x2f>;
+               mediatek,led_polarity = <0x17>;
+       };
+
+       wmac@10180000 {
+               status = "okay";
+               ralink,led-polarity = <1>;
+               ralink,mtd-eeprom = <&devdata 0x4000>;
        };
 
        gpio-leds {
                compatible = "gpio-leds";
+
                status {
-                       label = "d-link:green:status";
+                       label = "dir-610-a1:green:status";
                        gpios = <&gpio0 9 1>;
                };
-               wps {
-                       label = "d-link:green:wps";
+
+               wps {
+                       label = "dir-610-a1:green:wps";
                        gpios = <&gpio0 13 1>;
                };
-        };
+       };
 
-        gpio-keys-polled {
-               gpio-keys-polled {
+       gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #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>;
-                               linux,code = <0x211>;
-                       };
+
+               reset {
+                       label = "reset";
+                       gpios = <&gpio0 10 1>;
+                       linux,code = <0x198>;
                };
-       };
 
-       wmac@10180000 {
-               status = "okay";
-       };
+               wps {
+                       label = "wps";
+                       gpios = <&gpio0 0 1>;
+                       linux,code = <0x211>;
+               };
+       };
 };