ramips: rtxxxx: remove mac-address-increment

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7620a_edimax_br-6478ac-v2.dts

diff --git a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts
index 8f87212902e1ac45d629a4c1db2fcff785b5dd00..b829262474544548c7e2748622689dcf0a219eba 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts
+++ b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts
@@ -1,22 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Device Tree file for the Edimax BR-6478AC V2
- * based on Linksys E1700
- *
  * Copyright (C) 2016 Rohan Murch <rohan.murch@gmail.com>
  * Copyright (C) 2016 Hans Ulli Kroll <ulli.kroll@googlemail.com>
  * Copyright (C) 2017 James McKenzie <openwrt@madingley.org>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
-/dts-v1/;
-
 #include "mt7620a.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
        compatible = "edimax,br-6478ac-v2", "ralink,mt7620a-soc";
@@ -29,13 +22,8 @@
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                reset_wps {
                        label = "reset_wps";
@@ -48,19 +36,22 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "br-6478ac-v2:white:power";
+                       label = "white:power";
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
+
                internet {
-                       label = "br-6478ac-v2:blue:internet";
+                       label = "blue:internet";
                        gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                };
+
                wlan {
-                       label = "br-6478ac-v2:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
                };
+
                usb {
-                       label = "br-6478ac-v2:blue:usb";
+                       label = "blue:usb";
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
@@ -87,7 +78,7 @@
 
        flash@0 {
                compatible = "jedec,spi-nor";
-               reg = <0 0>;
+               reg = <0>;
                spi-max-frequency = <10000000>;
 
                partitions {
@@ -108,9 +99,24 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x200>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x200>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -120,7 +126,9 @@
                        };
 
                        partition@70000 {
-                               compatible = "edimax,uimage";
+                               compatible = "openwrt,uimage", "denx,uimage";
+                               openwrt,offset = <FW_EDIMAX_OFFSET>;
+                               openwrt,partition-magic = <FW_MAGIC_EDIMAX>;
                                label = "firmware";
                                reg = <0x00070000 0x00790000>;
                        };
@@ -128,20 +136,20 @@
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "uartf", "nd_sd";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "i2c", "uartf", "nd_sd";
+               function = "gpio";
        };
 };
 
 &ethernet {
-       status = "okay";
-       mtd-mac-address = <&factory 0x4>;
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
+
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
+
        mediatek,portmap = "wllll";
 
        port@5 {
@@ -186,11 +194,12 @@
 };
 
 &gsw {
-       mediatek,port4 = "gmac";
+       mediatek,ephy-base = /bits/ 8 <12>;
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &pcie {
@@ -200,8 +209,9 @@
 &pcie0 {
        wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
-               mediatek,2ghz = <0>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               nvmem-cell-names = "eeprom";
+               ieee80211-freq-limit = <5000000 6000000>;
        };
 };