ramips: clean up useless dts partition labels

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

diff --git a/target/linux/ramips/dts/mt7621_etisalat_s3.dts b/target/linux/ramips/dts/mt7621_etisalat_s3.dts
index 90309dad0a12a1c788658daa9df79bc348d00ac5..2fb3aedaff3dda033bc7766318a9536a9d44a851 100644 (file)
--- a/target/linux/ramips/dts/mt7621_etisalat_s3.dts
+++ b/target/linux/ramips/dts/mt7621_etisalat_s3.dts
@@ -23,21 +23,18 @@
                compatible = "gpio-leds";
 
                led-0 {
-                       label = "blue:wan";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_WAN;
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
 
                led_status_green: led-1 {
-                       label = "green:status";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                };
 
                led_status_red: led-2 {
-                       label = "red:status";
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
@@ -47,13 +44,13 @@
        keys {
                compatible = "gpio-keys";
 
-               wps {
+               button-0 {
                        label = "wps";
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
 
-               reset {
+               button-1 {
                        label = "reset";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
@@ -99,7 +96,7 @@
                        read-only;
                };
 
-               factory: partition@200000 {
+               partition@200000 {
                        label = "Factory";
                        reg = <0x200000 0x100000>;
                        sercomm,scpart-id = <2>;
@@ -119,7 +116,9 @@
                                };
 
                                macaddr_factory_21000: macaddr@21000 {
+                                       compatible = "mac-base";
                                        reg = <0x21000 0x6>;
+                                       #nvmem-cell-cells = <1>;
                                };
                        };
                };
@@ -180,9 +179,8 @@
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
 
-               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_21000>;
+               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_21000 3>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <(3)>;
        };
 };
 
@@ -192,14 +190,13 @@
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <2400000 2500000>;
 
-               nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_21000>;
+               nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_21000 2>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <(2)>;
        };
 };
 
 &gmac0 {
-       nvmem-cells = <&macaddr_factory_21000>;
+       nvmem-cells = <&macaddr_factory_21000 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -208,9 +205,8 @@
        label = "wan";
        phy-handle = <&ethphy0>;
 
-       nvmem-cells = <&macaddr_factory_21000>;
+       nvmem-cells = <&macaddr_factory_21000 11>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(11)>;
 };
 
 &mdio {