ath79: qca: remove mac-address-increment

[openwrt/staging/jow.git] / target / linux / ath79 / dts / qca9563_tplink_eap2x5-1port.dtsi

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
index 6252f1ae2f9732d70d8d6f40c393de1906408b0a..9e0b97fcbf3321684780811546c2aa5554be6dbe 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
@@ -81,6 +81,16 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       calibration_ath9k: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
@@ -98,21 +108,14 @@
 
        pinctrl-names = "default";
        pinctrl-0 = <&mdio_pins>;
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               reset-gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-       };
 };
 
 &eth0 {
        status = "okay";
 
-       phy-handle = <&phy4>;
-       phy-mode = "sgmii";
        pll-data = <0x03000000 0x00000101 0x00001313>;
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 
        qca956x-serdes-fixup;
@@ -125,17 +128,6 @@
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_info_8>;
-       nvmem-cell-names = "mac-address";
-};
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
+       nvmem-cells = <&macaddr_info_8 0>, <&calibration_ath9k>;
+       nvmem-cell-names = "mac-address", "calibration";
 };