ath79: ar: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ath79 / dts / ar9344_pcs_cap324.dts

diff --git a/target/linux/ath79/dts/ar9344_pcs_cap324.dts b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
index ada28d634a69274baffd28f1da99ea44f25ae093..451b0ecaca66ef5ed220f4640f3316d7581ddbd7 100644 (file)
--- a/target/linux/ath79/dts/ar9344_pcs_cap324.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
@@ -1,23 +1,23 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "ar9344.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "ar9344.dtsi"
-
 / {
        model = "PowerCloud Systems CAP324";
        compatible = "pcs,cap324", "qca,ar9344";
 
        aliases {
-               serial0 = &uart;
-               led-status = &status;
+               led-boot = &led_power_amber;
+               led-failsafe = &led_power_amber;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_amber;
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                pinctrl-names = "default";
                pinctrl-0 = <&jtag_disable_pins>;
@@ -33,62 +33,46 @@
        leds {
                compatible = "gpio-leds";
 
-               power_amber {
-                       label = "pcs:amber:power";
+               led_power_amber: power_amber {
+                       label = "amber:power";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                };
 
-               status: power_green {
-                       label = "pcs:green:power";
+               led_power_green: power_green {
+                       label = "green:power";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan_amber {
-                       label = "pcs:amber:wlan";
+                       label = "amber:wlan";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan_green {
-                       label = "pcs:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                        linux,default-trigger = "phy0tpt";
                };
 
                lan_amber {
-                       label = "pcs:lan:amber";
+                       label = "amber:lan";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                };
 
                lan_green {
-                       label = "pcs:lan:green";
+                       label = "green:lan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                };
        };
-
 };
 
 &ref {
        clock-frequency = <25000000>;
 };
 
-&uart {
-       status = "okay";
-};
-
-&gpio {
-       status = "okay";
-};
-
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
        flash@0 {
@@ -114,6 +98,7 @@
                        };
 
                        partition@50000 {
+                               compatible = "denx,uimage";
                                label = "firmware";
                                reg = <0x050000 0x0fa0000>;
                        };
@@ -122,6 +107,16 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -133,11 +128,12 @@
        ath9k: wifi@0,0 {
                compatible = "168c,0030";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
-               mtd-mac-address-increment = <(-2)>;
+               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cell-names = "mac-address";
+               mac-address-increment = <(-2)>;
                mtd-cal-data = <&art 0x5000>;
                qca,no-eeprom;
-               qca,disable-5ghz;
+               ieee80211-freq-limit = <2402000 2482000>;
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -146,17 +142,16 @@
 &wmac {
        status = "okay";
 
-       qca,disable-2ghz;
+       ieee80211-freq-limit = <4900000 5990000>;
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
-       mtd-mac-address-increment = <(-1)>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <(-1)>;
 };
 
 &mdio0 {
        status = "okay";
 
-       phy-mask = <0>;
-
        phy0: ethernet-phy@0 {
                reg = <0>;
                phy-mode = "rgmii";
@@ -169,7 +164,8 @@
        /* default for ar934x, except for 1000M */
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;