ath79: use "fixed-layout" for Embedded Wireless devices

[openwrt/openwrt.git] / target / linux / ath79 / dts / ar9331_embeddedwireless_dorin.dts

diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
index 4761b910937b8896e1e84448b6a2ad170f1bd49b..6286f203efc2aee5bf3e34b4e9b53f33d2870897 100644 (file)
--- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
+++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
@@ -1,11 +1,10 @@
 // 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"
-
 / {
        model = "Embedded Wireless Dorin";
        compatible = "embeddedwireless,dorin", "qca,ar9331";
@@ -15,14 +14,13 @@
                led-failsafe = &led_status;
                led-running = &led_status;
                led-upgrade = &led_status;
-               serial0 = &uart;
        };
 
        leds {
                compatible = "gpio-leds";
 
                led_status: status {
-                       label = "dorin:green:status";
+                       label = "green:status";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
        };
@@ -33,7 +31,7 @@
                wps {
                        label = "wps";
                        linux,code = <KEY_WPS_BUTTON>;
-                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                };
 
                reset {
@@ -44,14 +42,6 @@
        };
 };
 
-&uart {
-       status = "okay";
-};
-
-&gpio {
-       status = "okay";
-};
-
 &usb {
        dr_mode = "host";
        status = "okay";
@@ -64,8 +54,6 @@
 &spi {
        status = "okay";
 
-       num-chipselects = <1>;
-
        flash@0 {
                compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
@@ -97,6 +85,18 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               compatible = "mac-base";
+                                               reg = <0x1002 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                };
        };
@@ -105,9 +105,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x1002>;
-       mtd-mac-address-increment-byte = <3>;
-       mtd-mac-address-increment = <0x40>;
+       nvmem-cells = <&macaddr_art_1002 0x400000>;
+       nvmem-cell-names = "mac-address";
 };
 
 &mdio1 {