ramips: clean up useless dts partition labels

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

diff --git a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts
index b8fe2f8cdbf33dd07e76911c4e1e445222112d6d..f8429a021b8f8035fb7752b87d2c85a57abd4693 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts
+++ b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "engenius,esr600", "ralink,mt7620a-soc";
@@ -24,7 +25,8 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "amber:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
@@ -97,16 +99,40 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       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>;
+                                       };
+                               };
                        };
 
-                       iNIC_rf: partition@50000 {
+                       partition@50000 {
                                label = "iNIC_rf";
                                reg = <0x50000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_iNIC_rf_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       macaddr_iNIC_rf_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -134,7 +160,8 @@
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii1_pins &mdio_pins>;
 
-       mtd-mac-address = <&iNIC_rf 0x4>;
+       nvmem-cells = <&macaddr_iNIC_rf_4>;
+       nvmem-cell-names = "mac-address";
 
        port@5 {
                status = "okay";
@@ -144,7 +171,6 @@
 
        mdio-bus {
                status = "okay";
-               mediatek,mdio-mode;
 
                ethernet-phy@0 {
                        reg = <0>;
@@ -155,11 +181,15 @@
                                0x7c 0x0000007e /* PORT0 STATUS */
                                0x0c 0x05600000 /* PORT6 PAD MODE CTRL */
                                0x94 0x0000007e /* PORT6 STATUS */
-                               >;
+                       >;
                };
        };
 };
 
+&gsw {
+       mediatek,ephy-base = /bits/ 8 <8>;
+};
+
 &state_default {
        gpio {
                groups = "i2c", "uartf", "nd_sd", "wled";
@@ -175,12 +205,14 @@
        wifi@0,0 {
                compatible = "pci1814,5592";
                reg = <0x0 0 0 0 0>;
-               ralink,mtd-eeprom = <&factory 0x0>;
+               nvmem-cells = <&eeprom_factory_0>;
+               nvmem-cell-names = "eeprom";
        };
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&iNIC_rf 0x0>;
+       nvmem-cells = <&eeprom_iNIC_rf_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ehci {