ath79: ar: convert to mac-base

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

diff --git a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
index f27a58b8d7c15a0c6ed8360bfe1165ddcc21aac3..4b692b6d9bb3ab4183065e00af3bea3b865b4bb8 100644 (file)
--- a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
+++ b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
@@ -46,7 +46,7 @@
                usb {
                        label = "green:usb";
                        gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       trigger-sources = <&hub_port1>, <&hub_port2>;
+                       trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";
                };
 
@@ -119,16 +119,42 @@
                                read-only;
                        };
 
-                       art: partition@fe0000 {
+                       partition@fe0000 {
                                label = "art";
                                reg = <0xfe0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       calibration_art_5000: calibration@5000 {
+                                               reg = <0x5000 0x440>;
+                                       };
+                               };
                        };
 
-                       addr: partition@ff0000 {
+                       partition@ff0000 {
                                label = "addr";
                                reg = <0xff0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_addr_0: macaddr@0 {
+                                               compatible = "mac-base";
+                                               reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                };
        };
@@ -140,36 +166,15 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
-               qca,no-eeprom;
-               nvmem-cells = <&macaddr_addr_0>;
-               nvmem-cell-names = "mac-address";
-               mac-address-increment = <0x10>;
+               nvmem-cells = <&macaddr_addr_0 0x10>, <&calibration_art_5000>;
+               nvmem-cell-names = "mac-address", "calibration";
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       port@1 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <1>;
-               #trigger-source-cells = <0>;
-
-               hub_port1: port@1 {
-                       reg = <1>;
-                       #trigger-source-cells = <0>;
-               };
-
-               hub_port2: port@2 {
-                       reg = <2>;
-                       #trigger-source-cells = <0>;
-               };
-       };
 };
 
 &usb_phy {
@@ -179,9 +184,8 @@
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_addr_0>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&macaddr_addr_0 0>, <&calibration_art_1000>;
+       nvmem-cell-names = "mac-address", "calibration";
 };
 
 &mdio0 {
@@ -197,9 +201,8 @@
 
        pll-data = <0xe000000 0x04000101 0x04001313>;
 
-       nvmem-cells = <&macaddr_addr_0>;
+       nvmem-cells = <&macaddr_addr_0 0x21>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <0x21>;
 
        phy-mode = "rgmii-rxid";
        phy-handle = <&phy4>;
@@ -212,12 +215,3 @@
        };
 };
 
-&addr {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_addr_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};