ath79: ar: convert to mac-base

[openwrt/openwrt.git] / target / linux / ath79 / dts / ar7242_engenius_eap350-v1.dts

diff --git a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
index 4001897adf4d19b0df169deda0508684430d7a7b..8e8deba933775dd15de2ce0ab59c7398dfe2e29d 100644 (file)
--- a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
+++ b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
 #include "ar7242.dtsi"
+#include "ar724x_senao_loader-4k.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
@@ -47,95 +48,6 @@
                        linux,default-trigger = "phy0tpt";
                };
        };
-
-       virtual_flash {
-               compatible = "mtd-concat";
-
-               devices = <&fwconcat0 &fwconcat1>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               compatible = "openwrt,okli";
-                               label = "firmware";
-                               reg = <0x0 0x0>;
-                       };
-               };
-       };
-};
-
-&uart {
-       status = "okay";
-};
-
-&spi {
-       status = "okay";
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <20000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x0 0x40000>;
-                               read-only;
-                       };
-
-                       partition@40000 {
-                               label = "u-boot-env";
-                               reg = <0x40000 0x10000>;
-                       };
-
-                       partition@50000 {
-                               label = "custom";
-                               reg = <0x50000 0x50000>;
-                               read-only;
-                       };
-
-                       partition@a0000 {
-                               label = "loader";
-                               reg = <0xa0000 0x10000>;
-                               read-only;
-                       };
-
-                       fwconcat1: partition@b0000 {
-                               label = "fwconcat1";
-                               reg = <0xb0000 0xf0000>;
-                       };
-
-                       partition@1a0000 {
-                               label = "fakeroot";
-                               reg = <0x1a0000 0x10000>;
-                               read-only;
-                       };
-
-                       fwconcat0: partition@1b0000 {
-                               label = "fwconcat0";
-                               reg = <0x1b0000 0x4c0000>;
-                       };
-
-                       partition@670000 {
-                               label = "failsafe";
-                               reg = <0x670000 0x180000>;
-                               read-only;
-                       };
-
-                       art: partition@7f0000 {
-                               label = "art";
-                               reg = <0x7f0000 0x10000>;
-                               read-only;
-                       };
-               };
-       };
 };
 
 &mdio0 {
@@ -151,7 +63,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0 0>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy4>;
        phy-mode = "rgmii-id";
@@ -165,10 +78,24 @@
        ath9k: wifi@0,0,0 {
                compatible = "pci168c,002a";
                reg = <0x0 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
-               mtd-mac-address-increment = <1>;
+               nvmem-cells = <&macaddr_art_0 1>;
+               nvmem-cell-names = "mac-address";
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
+
+&art {
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_art_0: macaddr@0 {
+                       compatible = "mac-base";
+                       reg = <0x0 0x6>;
+                       #nvmem-cell-cells = <1>;
+               };
+       };
+};