ramips: convert mtd-mac-address to nvmem implementation

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / mt7620a_lava_lr-25g001.dts

diff --git a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts
index 20974c93e2547403f0279a44d2474a22dc723098..1966e4cffd1e8e49198189c61848a4f3ad4e1304 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts
+++ b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7620a.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -17,8 +15,7 @@
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                wps {
                        label = "wps";
@@ -37,17 +34,17 @@
                compatible = "gpio-leds";
 
                led_status: status {
-                       label = "lr-25g001:green:status";
+                       label = "green:status";
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                };
 
                wifi2g {
-                       label = "lr-25g001:green:wifi2g";
+                       label = "green:wifi2g";
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
 
                wifi5g {
-                       label = "lr-25g001:green:wifi5g";
+                       label = "green:wifi5g";
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
        };
@@ -64,10 +61,6 @@
        };
 };
 
-&gpio0 {
-       status = "okay";
-};
-
 &spi0 {
        status = "okay";
 
@@ -111,7 +104,6 @@
 };
 
 &ethernet {
-       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
 
@@ -123,9 +115,8 @@
 
        mdio-bus {
                status = "okay";
-               mediatek,mdio-mode = <1>;
 
-               phy0: ethernet-phy@0 {
+               ethernet-phy@0 {
                        reg = <0>;
                        phy-mode = "rgmii";
                        qca,ar8327-initvals = <
@@ -135,29 +126,13 @@
                                0x94 0x00000000 /* PORT6_STATUS */
                        >;
                };
-
-               phy1: ethernet-phy@1 {
-                       reg = <1>;
-                       phy-mode = "rgmii";
-               };
-
-               phy2: ethernet-phy@2 {
-                       reg = <2>;
-                       phy-mode = "rgmii";
-               };
-
-               phy3: ethernet-phy@3 {
-                       reg = <3>;
-                       phy-mode = "rgmii";
-               };
-
-               phy4: ethernet-phy@4 {
-                       reg = <4>;
-                       phy-mode = "rgmii";
-               };
        };
 };
 
+&gsw {
+       mediatek,ephy-base = /bits/ 8 <8>;
+};
+
 &pcie {
        status = "okay";
 };
@@ -165,17 +140,26 @@
 &pcie0 {
        mt76x0e@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&config 0xe07e>;
-               mtd-mac-address-increment = <(2)>;
+               nvmem-cells = <&macaddr_config_e07e>;
+               nvmem-cell-names = "mac-address";
+               mac-address-increment = <(2)>;
                mediatek,mtd-eeprom = <&config 0xe08a>;
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "uartf", "i2c";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "uartf", "i2c";
+               function = "gpio";
+       };
+};
+
+&config {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_config_e07e: macaddr@e07e {
+               reg = <0xe07e 0x6>;
        };
 };