ath79: ar: convert to mac-base

[openwrt/staging/hauke.git] / target / linux / ath79 / dts / ar7240_netgear_wnr612-v2.dtsi

diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
index 382529b32d0089c337e259c15bd428644e8ad6af..ac27874c68ab7be6d8472870b63f57f898c9fb14 100644 (file)
--- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
        aliases {
@@ -89,7 +90,9 @@
                        };
 
                        partition@50000 {
-                               compatible = "netgear,uimage";
+                               compatible = "openwrt,uimage", "denx,uimage";
+                               openwrt,ih-magic = <0x32303631>;
+                               openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
                                reg = <0x50000 0x3a0000>;
                                label = "firmware";
                        };
@@ -98,19 +101,37 @@
                                reg = <0x3f0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               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>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0 0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie {
@@ -119,14 +140,10 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002b";
                reg = <0x0000 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;
        };
 };
-
-&uart {
-       status = "okay";
-};