ramips: fix mtd partition node names for Phicomm PSG1208

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7620a_phicomm_psg1208.dts

diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts
index 310f78ec51f5ce9b327e044ed6fc7eb6fcd3c035..fc4f1d6258546d2e4bf815cc34364c85b09dfec0 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7620a.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -20,12 +18,12 @@
                compatible = "gpio-leds";
 
                led_wps: wps {
-                       label = "psg1208:white:wps";
+                       label = "white:wps";
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "psg1208:white:wlan2g";
+                       label = "white:wlan2g";
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                };
        };
@@ -52,10 +50,11 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
-               spi-max-frequency = <10000000>;
+               spi-max-frequency = <80000000>;
+               m25p,fast-read;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -68,19 +67,19 @@
                                read-only;
                        };
 
-                       partition@20000 {
+                       partition@30000 {
                                label = "u-boot-env";
                                reg = <0x30000 0x10000>;
                                read-only;
                        };
 
-                       factory: partition@30000 {
+                       factory: partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
                        };
 
-                       partition@40000 {
+                       partition@50000 {
                                compatible = "denx,uimage";
                                label = "firmware";
                                reg = <0x50000 0x7b0000>;
@@ -89,19 +88,20 @@
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "spi refclk", "wled";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "i2c", "spi refclk", "wled";
+               function = "gpio";
        };
 };
 
 &ethernet {
        pinctrl-names = "default";
        pinctrl-0 = <&ephy_pins>;
-       mtd-mac-address = <&factory 0x4>;
+
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
+
        mediatek,portmap = "llllw";
 };
 
@@ -118,5 +118,15 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
+       ralink,mtd-eeprom = <&factory 0x0>;
+};
+
+&factory {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_factory_4: macaddr@4 {
+               reg = <0x4 0x6>;
+       };
 };