ramips: convert mtd-mac-address to nvmem implementation

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / mt7620a_tplink_archer-c2-v1.dts

diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
index 2d7f6c03a32032b9e8502be23a7f287688445bd4..63643927d51f078d9300a8f06aa432151508b38a 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7620a.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -20,43 +18,35 @@
                bootargs = "console=ttyS0,115200";
        };
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        leds {
                compatible = "gpio-leds";
 
                lan {
-                       label = "archer-c2-v1:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "archer-c2-v1:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
                };
 
                led_wps: wps {
-                       label = "archer-c2-v1:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "archer-c2-v1:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "archer-c2-v1:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "phy1tpt";
                };
        };
 
@@ -87,10 +77,10 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
-               spi-max-frequency = <10000000>;
+               spi-max-frequency = <30000000>;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -137,11 +127,12 @@
 };
 
 &ethernet {
-       status = "okay";
-       mtd-mac-address = <&rom 0xf100>;
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
 
+       nvmem-cells = <&macaddr_rom_f100>;
+       nvmem-cell-names = "mac-address";
+
        port@5 {
                status = "okay";
                mediatek,fixed-link = <1000 1 1 1>;
@@ -153,7 +144,6 @@
        };
 };
 
-
 &gpio1 {
        status = "okay";
 };
@@ -166,9 +156,17 @@
        status = "okay";
 };
 
+&state_default {
+       gpio {
+               groups = "i2c", "uartf", "wled", "ephy", "spi refclk";
+               function = "gpio";
+       };
+};
+
 &wmac {
-       ralink,mtd-eeprom = <&radio 0>;
-       mtd-mac-address = <&rom 0xf100>;
+       ralink,mtd-eeprom = <&radio 0x0>;
+       nvmem-cells = <&macaddr_rom_f100>;
+       nvmem-cell-names = "mac-address";
 };
 
 &ehci {
@@ -187,5 +185,18 @@
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
                mediatek,mtd-eeprom = <&radio 0x8000>;
+               nvmem-cells = <&macaddr_rom_f100>;
+               nvmem-cell-names = "mac-address";
+               mac-address-increment = <(-1)>;
+       };
+};
+
+&rom {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_rom_f100: macaddr@f100 {
+               reg = <0xf100 0x6>;
        };
 };