ath79: ar: convert to nvmem-layout

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

diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
index 92b0beccd7c957be165e3e3da7d1bd7126cdb577..d2a30000044e63d0af0b2213672ab4c74107ad3a 100644 (file)
--- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
        chosen {
@@ -82,7 +83,7 @@
 
        ubi-concat {
                compatible = "mtd-concat";
-               devices = <&ubipart0 &ubipart1>;
+               devices = <&ubiconcat0 &ubiconcat1>;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -126,6 +127,28 @@
                        label = "caldata";
                        reg = <0x80000 0x40000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_caldata_0: macaddr@0 {
+                                       reg = <0x0 0x6>;
+                               };
+
+                               macaddr_caldata_c: macaddr@c {
+                                       reg = <0xc 0x6>;
+                               };
+
+                               cal_art_1000: cal@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
+
+                               cal_art_5000: cal@5000 {
+                                       reg = <0x5000 0x440>;
+                               };
+                       };
                };
 
                partition@c0000 {
@@ -153,15 +176,17 @@
                        reg = <0x6c0000 0x400000>;
                };
 
-               ubipart0: partition@ac0000 {
-                       label = "ubipart0";
+               ubiconcat0: partition@ac0000 {
+                       label = "ubiconcat0";
                        reg = <0xac0000 0x1500000>;
                };
 
                partition@6c0000 {
                        label = "firmware";
                        reg = <0x6c0000 0x1900000>;
-                       compatible = "netgear,uimage";
+                       compatible = "openwrt,uimage", "denx,uimage";
+                       openwrt,ih-magic = <0x33373033>;
+                       openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
                };
 
                partition@1fc0000 {
@@ -170,8 +195,8 @@
                        read-only;
                };
 
-               ubipart1: partition@2000000 {
-                       label = "ubipart1";
+               ubiconcat1: partition@2000000 {
+                       label = "ubiconcat1";
                        reg = <0x2000000 0x6000000>;
                };
        };
@@ -189,8 +214,6 @@
 &mdio0 {
        status = "okay";
 
-       phy-mask = <0>;
-
        phy0: ethernet-phy@0 {
                reg = <0>;
                phy-mode = "rgmii";
@@ -216,7 +239,8 @@
        /* default for ar934x, except for 1000M */
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&caldata 0x0>;
+       nvmem-cells = <&macaddr_caldata_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
@@ -241,8 +265,8 @@
 &wmac {
        status = "okay";
 
-       mtd-mac-address = <&caldata 0x0>;
-       qca,no-eeprom;
+       nvmem-cells = <&macaddr_caldata_0>, <&cal_art_1000>;
+       nvmem-cell-names = "mac-address", "calibration";
 };
 
 &pcie {
@@ -251,13 +275,9 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&caldata 0xc>;
-               qca,no-eeprom;
+               nvmem-cells = <&macaddr_caldata_c>, <&cal_art_5000>;
+               nvmem-cell-names = "mac-address", "calibration";
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
-
-&uart {
-       status = "okay";
-};