ath79: qca: remove mac-address-increment

[openwrt/openwrt.git] / target / linux / ath79 / dts / qca9531_tplink_tl-mr3420-v3.dts

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
index d163a73228f9d8845cdc06137d217842108181d7..f288317c2c374fb4283763543e115c4c09f27dbf 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
@@ -102,7 +102,7 @@
                usb {
                        label = "green:usb";
                        gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
-                       trigger-sources = <&hub_port>;
+                       trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
@@ -132,10 +132,6 @@
 
 };
 
-&uart {
-       status = "okay";
-};
-
 &spi {
        status = "okay";
 
@@ -153,6 +149,18 @@
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
+                                               reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -175,30 +183,25 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
-       mtd-mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {