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

[openwrt/openwrt.git] / target / linux / ramips / dts / MPRA2.dts

diff --git a/target/linux/ramips/dts/MPRA2.dts b/target/linux/ramips/dts/MPRA2.dts
index 39e534d029267c46db85efaae7bff74078c31ff7..86c741f1014fc8c236d9790306793108f6c052c6 100644 (file)
--- a/target/linux/ramips/dts/MPRA2.dts
+++ b/target/linux/ramips/dts/MPRA2.dts
@@ -7,64 +7,62 @@
        model = "HAME MPR-A2";
 
        palmbus@10000000 {
-               sysc@0 {
-                       ralink,pinmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii";
-                       ralink,gpiomux = "jtag";
-                       ralink,uartmux = "gpio";
-                       ralink,wdtmux = <1>;
-               };
-
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
                spi@b00 {
                        status = "okay";
+
                        m25p80@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "s25fl064k";
+                               compatible = "jedec,spi-nor";
                                reg = <0 0>;
                                linux,modalias = "m25p80", "s25fl064k";
                                spi-max-frequency = <10000000>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               partition@30000 {
-                       label = "u-boot-env";
-                       reg = <0x30000 0x10000>;
-                       read-only;
-               };
-
-               factory: partition@40000 {
-                       label = "factory";
-                       reg = <0x40000 0x10000>;
-                       read-only;
+                               partition@0 {
+                                       label = "u-boot";
+                                       reg = <0x0 0x30000>;
+                                       read-only;
+                               };
+
+                               partition@30000 {
+                                       label = "u-boot-env";
+                                       reg = <0x30000 0x10000>;
+                                       read-only;
+                               };
+
+                               factory: partition@40000 {
+                                       label = "factory";
+                                       reg = <0x40000 0x10000>;
+                                       read-only;
+                               };
+
+                               partition@50000 {
+                                       label = "firmware";
+                                       reg = <0x50000 0x7b0000>;
+                               };
+                       };
                };
+       };
 
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0x7b0000>;
-               };
+       pinctrl {
+               state_default: pinctrl0 {
+                       gpio {
+                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                               ralink,function = "gpio";
                        };
                };
        };
 
        ethernet@10100000 {
-               status = "okay";
+               mtd-mac-address = <&factory 0x4>;
        };
 
        esw@10110000 {
-               status = "okay";
-               ralink,portmap = <0x2f>;
+               mediatek,portmap = <0x2f>;
        };
 
        wmac@10180000 {
-               status = "okay";
+               ralink,mtd-eeprom = <&factory 0>;
        };
 
        ehci@101c0000 {
@@ -77,10 +75,12 @@
 
        gpio-leds {
                compatible = "gpio-leds";
+
                system {
                        label = "mpr-a2:blue:system";
                        gpios = <&gpio0 20 1>;
                };
+
                power {
                        label = "mpr-a2:red:power";
                        gpios = <&gpio0 17 1>;
@@ -92,6 +92,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
                poll-interval = <20>;
+
                wps {
                        label = "reset";
                        gpios = <&gpio0 0 1>;
@@ -108,6 +109,7 @@
                        gpio-export,output = <1>;
                        gpios = <&gpio0 7 0>;
                };
+
                root_hub {
                        gpio-export,name = "root_hub";
                        gpio-export,output = <1>;