ramips: mt7628: use mac-base

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7628an_tplink_tl-wr840n-v5.dts

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
index 773839098bfe0d6fc7d9e5b6b3ed975c4d58a672..3e639668bbaa0df62e7d7bbf0593507d1549dfe9 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7628an.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -20,33 +18,28 @@
                bootargs = "console=ttyS0,115200";
        };
 
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x4000000>;
-       };
-
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
+
        /* LED used is dual-color,dual lead LED */
        leds {
                compatible = "gpio-leds";
 
                led_power_green: power {
-                       label = "tl-wr840n-v5:green:power";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       label = "green:power";
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                orange {
-                       label = "tl-wr840n-v5:orange:power";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       label = "orange:power";
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
        };
 };
@@ -54,7 +47,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -80,6 +73,20 @@
                                label = "factory";
                                reg = <0x3f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       macaddr_factory_f100: macaddr@f100 {
+                                               reg = <0xf100 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -95,20 +102,23 @@
 
 &wmac {
        status = "okay";
-       mtd-mac-address = <&factory 0xf100>;
-       mediatek,mtd-eeprom = <&factory 0x0>;
+
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_f100>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0xf100>;
-       mediatek,portmap = "wllll";
+       nvmem-cells = <&macaddr_factory_f100>;
+       nvmem-cell-names = "mac-address";
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "p0led_an", "p2led_an", "perst";
-                       ralink,function = "gpio";
-               };
+&esw {
+       mediatek,portmap = <0x3e>;
+};
+
+&state_default {
+       gpio {
+               groups = "p0led_an", "p2led_an", "perst";
+               function = "gpio";
        };
 };