ath79: fix MAC address setup for TP-Link TL-WDR3600/TL-WDR4300

[openwrt/openwrt.git] / target / linux / ath79 / dts / ar9344_tplink_tl-wdr4300.dtsi

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
index 558a763747f8113664ca78fca06ce315aa047547..f6e4856ec5ef1739a363970dec0b2ea73f473c3d 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
@@ -6,11 +6,11 @@
 #include "ar9344.dtsi"
 
 / {
-       model = "TP-Link WDR4300";
-       compatible = "tplink,tl-wdr4300";
-
        aliases {
-               led-status = &system;
+               led-boot = &system;
+               led-failsafe = &system;
+               led-running = &system;
+               led-upgrade = &system;
        };
 
        leds {
@@ -19,7 +19,6 @@
                usb1 {
                        label = "tp-link:green:usb1";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                        trigger-sources = <&hub_port1>;
                        linux,default-trigger = "usbport";
                };
@@ -27,7 +26,6 @@
                usb2 {
                        label = "tp-link:green:usb2";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                        trigger-sources = <&hub_port2>;
                        linux,default-trigger = "usbport";
                };
@@ -35,7 +33,6 @@
                wlan2g {
                        label = "tp-link:green:wlan2g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                        linux,default-trigger = "phy0tpt";
                };
 
@@ -48,7 +45,6 @@
                qss {
                        label = "tp-link:green:qss";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                };
        };
 
@@ -58,15 +54,12 @@
                wlan5g {
                        label = "tp-link:green:wlan5g";
                        gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                        linux,default-trigger = "phy1tpt";
                };
        };
 
        keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
@@ -85,7 +78,6 @@
 
        gpio-export {
                compatible = "gpio-export";
-               #size-cells = <0>;
 
                gpio_usb1_power {
                        gpio-export,name = "tp-link:power:usb1";
@@ -131,8 +123,6 @@
        status = "okay";
 
        flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <25000000>;
@@ -149,6 +139,7 @@
                        };
 
                        partition@20000 {
+                               compatible = "tplink,firmware";
                                label = "firmware";
                                reg = <0x020000 0x7d0000>;
                        };
@@ -163,9 +154,13 @@
 };
 
 &usb {
+       #address-cells = <1>;
+       #size-cells = <0>;
        status = "okay";
 
        port@1 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                reg = <1>;
                #trigger-source-cells = <0>;
 
@@ -188,7 +183,7 @@
 &pcie {
        status = "okay";
 
-       ath9k: wifi@168c,0033 {
+       ath9k: wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
                mtd-mac-address = <&uboot 0x1fc00>;
@@ -234,7 +229,6 @@
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
        mtd-mac-address = <&uboot 0x1fc00>;
-       mtd-mac-address-increment = <(-2)>;
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;