mediatek: use mac-base

[openwrt/staging/stintel.git] / target / linux / mediatek / dts / mt7986a-tplink-tl-xdr-common.dtsi

diff --git a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
index 94edfd121e42cf300c764ea37028b77de9988176..da08bdc723b1b23dfc827eb082676c877c4ed8dd 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
@@ -95,7 +95,7 @@
                reg = <0>;
                phy-mode = "2500base-x";
 
-               nvmem-cells = <&macaddr_config_1c>;
+               nvmem-cells = <&macaddr_config_1c 0>;
                nvmem-cell-names = "mac-address";
 
                fixed-link {
@@ -111,9 +111,8 @@
                phy-handle = <&phy7>;
                phy-mode = "2500base-x";
 
-               nvmem-cells = <&macaddr_config_1c>;
+               nvmem-cells = <&macaddr_config_1c 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
        };
 
        mdio: mdio-bus {
@@ -141,7 +140,7 @@
                realtek,aldps-enable;
        };
 
-       switch: switch@31 {
+       switch: switch@1f {
                compatible = "mediatek,mt7531";
                reg = <31>;
                reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;
@@ -164,8 +163,8 @@
                reg = <0>;
 
                spi-max-frequency = <20000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -182,6 +181,18 @@
                                label = "config";
                                reg = <0x100000 0x0060000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_1c: macaddr@1c {
+                                               compatible = "mac-base";
+                                               reg = <0x1c 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        factory: partition@160000 {
@@ -253,18 +264,7 @@
 
 &wifi {
        mediatek,mtd-eeprom = <&factory 0x0>;
-       nvmem-cells = <&macaddr_config_1c>;
+       nvmem-cells = <&macaddr_config_1c 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
        status = "okay";
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_1c: macaddr@1c {
-               reg = <0x1c 0x6>;
-       };
-};