ath79: ar: convert to nvmem-layout

[openwrt/staging/jow.git] / target / linux / ath79 / dts / ar9341_tplink_tl-mr3420-v2.dts

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
index f864381520c5c73f7ff7ba8cf42978fb06328413..1f089affac3f421e571f563f229f4f52d3fa8f85 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
@@ -1,25 +1,37 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
 #include "ar9341_tplink.dtsi"
 
 / {
        model = "TP-Link TL-MR3420 v2";
        compatible = "tplink,tl-mr3420-v2", "qca,ar9341";
-};
 
-&keys {
-       reset {
-               label = "Reset";
-               linux,code = <KEY_RESTART>;
-               gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
-               debounce-interval = <60>;
+       aliases {
+               label-mac-device = &wmac;
+       };
+
+       keys {
+               compatible = "gpio-keys";
+
+               rfkill {
+                       label = "WiFi";
+                       linux,code = <KEY_RFKILL>;
+                       gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
+                       debounce-interval = <60>;
+               };
+
+               reset {
+                       label = "Reset/WPS";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+                       debounce-interval = <60>;
+               };
        };
 };
 
 &leds {
        usb {
-               label = "tp-link:green:usb";
+               label = "green:usb";
                gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                trigger-sources = <&hub_port>;
                linux,default-trigger = "usbport";
@@ -36,8 +48,6 @@
 };
 
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
        flash@0 {
@@ -54,6 +64,16 @@
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -72,16 +92,27 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {
        status = "okay";
 };
+
+&eth0 {
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <(-1)>;
+};
+
+&eth1 {
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&wmac {
+       mtd-cal-data = <&art 0x1000>;
+
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};