ramips: mt7621: nix mac-address-increment

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / mt7621_tplink_archer-x6-v3.dtsi

diff --git a/target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi b/target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi
index 6454273f496a46dc174b79d2f9907e66f34bfbb7..d3db8cd602cb76443e59b98bfc8e9281190dd2a8 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi
+++ b/target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        aliases {
@@ -21,14 +22,14 @@
        keys {
                compatible = "gpio-keys";
 
-               wps {
+               button-wps {
                        label = "wps";
-                       gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
 
-               reset {
+               button-reset {
                        label = "reset";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
@@ -39,35 +40,44 @@
        leds {
                compatible = "gpio-leds";
 
-               led_power: power {
+               led_power: led-power {
                        label = "green:power";
+                       color = <LED_COLOR_ID_GREEN>;
+                       function = LED_FUNCTION_POWER;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
-               wan_orange {
-                       label = "orange:wan";
+               led-wan-amber {
+                       color = <LED_COLOR_ID_AMBER>;
+                       function = LED_FUNCTION_WAN;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
-               lan {
-                       label = "green:lan";
+               led-lan {
+                       color = <LED_COLOR_ID_GREEN>;
+                       function = LED_FUNCTION_LAN;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
-               wifi5g {
-                       label = "green:wifi5g";
+               led-wifi5g {
+                       color = <LED_COLOR_ID_GREEN>;
+                       function = LED_FUNCTION_WLAN;
+                       function-enumerator = <5>;
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
-               wifi2g {
-                       label = "green:wifi2g";
+               led-wifi2g {
+                       color = <LED_COLOR_ID_GREEN>;
+                       function = LED_FUNCTION_WLAN;
+                       function-enumerator = <2>;
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
-               wan_green {
-                       label = "green:wan";
+               led-wan-green {
+                       color = <LED_COLOR_ID_GREEN>;
+                       function = LED_FUNCTION_WAN;
                        gpios = <&gpio 45 GPIO_ACTIVE_LOW>;
                };
        };
@@ -102,12 +112,38 @@
                                label = "config";
                                reg = <0xfa0000 0x50000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_8: macaddr@8 {
+                                               compatible = "mac-base";
+                                               reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        radio: partition@ff0000 {
                                label = "radio";
                                reg = <0xff0000 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>;
+                                       };
+                               };
                        };
                };
        };
@@ -120,11 +156,6 @@
        };
 };
 
-&ethernet {
-       pinctrl-names = "default";
-       pinctrl-0 = <&rgmii1_pins &mdio_pins>;
-};
-
 &pcie {
        status = "okay";
 };
@@ -133,10 +164,8 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x0>;
-               nvmem-cells = <&macaddr_config_8>;
-               nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
+               nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_8 1>;
+               nvmem-cell-names = "eeprom", "mac-address";
                ieee80211-freq-limit = <2400000 2500000>;
        };
 };
@@ -145,10 +174,8 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x8000>;
-               nvmem-cells = <&macaddr_config_8>;
-               nvmem-cell-names = "mac-address";
-               mac-address-increment = <2>;
+               nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_8 2>;
+               nvmem-cell-names = "eeprom", "mac-address";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
@@ -158,7 +185,7 @@
 };
 
 &gmac0 {
-       nvmem-cells = <&macaddr_config_8>;
+       nvmem-cells = <&macaddr_config_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -190,13 +217,3 @@
                };
        };
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};