ramips: clean up useless dts partition labels

[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 92fcfdf68c6e9c4ab4f473fe5f3f72361a84b833..c5c4d01835b81dc0240faf5ff524ea8a771e6c98 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "mt7620a.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "phicomm,psg1208", "ralink,mt7620a-soc";
@@ -20,12 +19,13 @@
                compatible = "gpio-leds";
 
                led_wps: wps {
-                       label = "psg1208:white:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "psg1208:white:wlan2g";
+                       label = "white:wlan2g";
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                };
        };
@@ -52,10 +52,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 +69,37 @@
                                read-only;
                        };
 
-                       partition@20000 {
+                       partition@30000 {
                                label = "u-boot-env";
                                reg = <0x30000 0x10000>;
                                read-only;
                        };
 
-                       factory: partition@30000 {
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
-                       partition@40000 {
+                       partition@50000 {
                                compatible = "denx,uimage";
                                label = "firmware";
                                reg = <0x50000 0x7b0000>;
@@ -91,15 +110,18 @@
 
 &state_default {
        gpio {
-               ralink,group = "i2c", "spi refclk", "wled";
-               ralink,function = "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";
 };
 
@@ -110,11 +132,13 @@
 &pcie0 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };