ath79: ar: convert to nvmem-layout

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

diff --git a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
index c5122dbd9f93da3055f8257ffab5d1167cef3054..9d4ab231ccf1bd7ec37d994ea48917d8b9d9238c 100644 (file)
--- a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
+++ b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
@@ -41,8 +41,8 @@
 
        gpio_spi {
                compatible = "spi-gpio";
-               #address-cells = <0x1>;
-               ranges;
+               #address-cells = <1>;
+               #size-cells = <0>;
 
                sck-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
                mosi-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
@@ -104,6 +104,20 @@
                                reg = <0x7f0000 0x010000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -114,26 +128,16 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &pcie {
        status = "okay";
 };
 
-&uart {
-       status = "okay";
-};
-
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };