ath79: ar: convert to mac-base

[openwrt/staging/hauke.git] / target / linux / ath79 / dts / ar9331_tplink_tl-wr741nd-v4.dtsi

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
index f28e56b53b867854aa725fbf38e94a7fe256790c..613b357dc872d2ff66dc69602b9a2ab27b220f1f 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
@@ -1,26 +1,24 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "ar9331.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "ar9331.dtsi"
-
 / {
        compatible = "tplink,tl-wr741n-v4", "qca,ar9331";
        model = "TP-Link TL-WR741N/ND v4";
 
        aliases {
-               serial0 = &uart;
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
+               label-mac-device = &wmac;
        };
 
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+       keys {
+               compatible = "gpio-keys";
 
                reset {
                        label = "reset";
@@ -37,50 +35,50 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
+
                pinctrl-names = "default";
-               pinctrl-0 = <&switch_led_pins>;
+               pinctrl-0 = <&switch_led_disable_pins>;
 
                lan1 {
-                       label = "tp-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                };
 
                lan2 {
-                       label = "tp-link:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                };
 
                lan3 {
-                       label = "tp-link:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
                };
 
                lan4 {
-                       label = "tp-link:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                };
 
-               system: system {
-                       label = "tp-link:green:system";
-                       gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;
+               led_system: system {
+                       label = "green:system";
+                       gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       default-state = "off";
                        linux,default-trigger = "phy0tpt";
                };
        };
@@ -88,7 +86,6 @@
 
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -104,9 +101,22 @@
                                reg = <0x0 0x20000>;
                                label = "u-boot";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
+                                               reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        firmware: partition@20000 {
+                               compatible = "tplink,firmware";
                                reg = <0x20000 0x3d0000>;
                                label = "firmware";
                        };
@@ -120,11 +130,11 @@
        };
 };
 
-&eth0 {
+&eth0 {                /* WAN interface, initialized last as eth1 */
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
-       mtd-mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -134,23 +144,17 @@
        };
 };
 
-&eth1 {
+&eth1 {                /* LAN interface, initialized first as eth0 */
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
-       mtd-mac-address-increment = <(-1)>;
-};
-
-&gpio {
-       status = "okay";
-};
-
-&uart {
-       status = "okay";
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
+       nvmem-cell-names = "mac-address";
 };