ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_tplink_tl-wpa8631p-v3.dts

diff --git a/target/linux/ramips/dts/mt7621_tplink_tl-wpa8631p-v3.dts b/target/linux/ramips/dts/mt7621_tplink_tl-wpa8631p-v3.dts
index 7012c315c1f0be7bd17e4f398549b33f93f243e5..54f3b88e579d9b37a13f1e6e891a1fd5352763a8 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_tl-wpa8631p-v3.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_tl-wpa8631p-v3.dts
@@ -4,10 +4,11 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "tplink,tl-wpa8631p-v3", "mediatek,mt7621-soc";
-       model = "TP-Link WPA8631P v3";
+       model = "TP-Link TL-WPA8631P v3";
 
        aliases {
                label-mac-device = &gmac0;
@@ -53,12 +54,14 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
                };
 
@@ -75,15 +78,15 @@
                };
        };
 
-        gpio-export {
-                compatible = "gpio-export";
+       gpio-export {
+               compatible = "gpio-export";
 
-                led_control {
-                        gpio-export,name = "tp-link:led:control";
-                        gpio-export,output = <0>;
-                        gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
-                };
-        };
+               led_control {
+                       gpio-export,name = "tp-link:led:control";
+                       gpio-export,output = <0>;
+                       gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
+               };
+       };
 };
 
 &spi0 {
@@ -111,16 +114,42 @@
                                reg = <0x20000 0x710000>;
                        };
 
-                       config: partition@730000 {
+                       partition@730000 {
                                label = "config";
                                reg = <0x730000 0xc0000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_2008: macaddr@2008 {
+                                               compatible = "mac-base";
+                                               reg = <0x2008 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
-                       radio: partition@7f0000 {
+                       partition@7f0000 {
                                label = "radio";
                                reg = <0x7f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
+                               };
                        };
                };
        };
@@ -141,9 +170,8 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x0>;
-               nvmem-cells = <&macaddr_config_2008>;
-               nvmem-cell-names = "mac-address";
+               nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008 0>;
+               nvmem-cell-names = "eeprom", "mac-address";
                ieee80211-freq-limit = <2400000 2500000>;
        };
 };
@@ -152,16 +180,18 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x8000>;
-               nvmem-cells = <&macaddr_config_2008>;
-               nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
+               nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008 1>;
+               nvmem-cell-names = "eeprom", "mac-address";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
 
+&ethernet {
+       pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
+};
+
 &gmac0 {
-       nvmem-cells = <&macaddr_config_2008>;
+       nvmem-cells = <&macaddr_config_2008 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -188,13 +218,3 @@
                };
        };
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_2008: macaddr@2008 {
-               reg = <0x2008 0x6>;
-       };
-};