apk: update to latest HEAD 2024-05-18

[openwrt/openwrt.git] / target / linux / ath79 / dts / ar9342_ubnt_xw.dtsi

diff --git a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
index 1d9df2170ca4cba3956fbd287420cd40be0dfa79..cd39410be592bd65022f1ca7160a97f6f29972d8 100644 (file)
--- a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
@@ -1,46 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
+#include "ar9344.dtsi"
+
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "ar9344.dtsi"
-
 / {
        compatible = "ubnt,xw", "qca,ar9342";
        model = "Ubiquiti Networks XW board";
 
-       aliases {
-               led-boot = &led_link4;
-               led-running = &led_link4;
-               led-upgrade = &led_link4;
-               led-failsafe = &led_link4;
-               label-mac-device = &wmac;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               link1 {
-                       label = "ubnt:red:link1";
-                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-               };
-
-               link2 {
-                       label = "ubnt:orange:link2";
-                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-               };
-
-               link3 {
-                       label = "ubnt:green:link3";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-               };
-
-               led_link4: link4 {
-                       label = "ubnt:green:link4";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-               };
-       };
-
        keys {
                compatible = "gpio-keys";
 
@@ -57,13 +25,8 @@
        clock-frequency = <40000000>;
 };
 
-&uart {
-       status = "okay";
-};
-
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -103,6 +66,20 @@
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
@@ -111,9 +88,11 @@
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&calibration_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };