ath79: ar: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ath79 / dts / ar9330_pqi_air-pen.dts

diff --git a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
index 06f728b26764477ed53a36ef4c742a879938a091..a2665519f4622403748bcb6eb82a19e87d265823 100644 (file)
--- a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
+++ b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
@@ -1,40 +1,37 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "ar9330.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "ar9330.dtsi"
-
 / {
        model = "PQI Air-Pen";
        compatible = "pqi,air-pen", "qca,ar9330";
 
        aliases {
-               serial0 = &uart;
-               led-boot = &wlan;
-               led-failsafe = &wlan;
-               led-upgrade = &wlan;
+               led-boot = &led_wlan;
+               led-failsafe = &led_wlan;
+               led-upgrade = &led_wlan;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               wlan: wlan {
-                       label = "air-pen:blue:wlan";
+               led_wlan: wlan {
+                       label = "blue:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps {
-                       label = "air-pen:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
                };
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <100>;
+               compatible = "gpio-keys";
 
                wps {
                        label = "wps";
@@ -52,14 +49,6 @@
        };
 };
 
-&uart {
-       status = "okay";
-};
-
-&gpio {
-       status = "okay";
-};
-
 &usb {
        dr_mode = "host";
        status = "okay";
@@ -70,12 +59,11 @@
 };
 
 &spi {
-       num-cs = <1>;
        status = "okay";
 
        flash@0 {
                compatible = "jedec,spi-nor";
-               spi-max-frequency = <104000000>;
+               spi-max-frequency = <50000000>;
                reg = <0>;
 
                partitions {
@@ -98,6 +86,20 @@
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_2: macaddr@2 {
+                                               reg = <0x2 0x6>;
+                                       };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -124,7 +126,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -136,11 +139,14 @@
 
 &eth1 {
        status = "okay";
+
        compatible = "syscon", "simple-mfd";
 };
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x2>;
+       nvmem-cells = <&macaddr_art_2>;
+       nvmem-cell-names = "mac-address";
 };