ath79: really fix TP-Link Archer C7 v2 MAC address

[openwrt/openwrt.git] / target / linux / ath79 / dts / qca9558_tl-archer-c7.dtsi

diff --git a/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi b/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi
index 08bb510ea71f206c5a49ad98c247fbded22b0de0..6fb25a9d2e456f84e195891cabfb9d1c0d207b0d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi
+++ b/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi
@@ -7,11 +7,6 @@
 #include "qca9557.dtsi"
 
 / {
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x8000000>;
-       };
-
        chosen {
                bootargs = "console=ttyS0,115200n8";
        };
@@ -20,7 +15,7 @@
                led-status = &system;
        };
 
-       leds {
+       gpio_leds: leds {
                compatible = "gpio-leds";
 
                system: system {
@@ -31,21 +26,21 @@
 
                usb1 {
                        label = "tp-link:green:usb1";
-                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        default-state = "off";
-                       trigger-sources = <&hub_port0>;
+                       trigger-sources = <&hub_port1>;
                        linux,default-trigger = "usbport";
                };
 
                usb2 {
                        label = "tp-link:green:usb2";
-                       gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        default-state = "off";
-                       trigger-sources = <&hub_port1>;
+                       trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
-               wlan2g {
+               led_wlan2g: wlan2g {
                        label = "tp-link:green:wlan2g";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        default-state = "off";
@@ -57,16 +52,9 @@
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
-
-               wlan5g {
-                       label = "tp-link:green:wlan5g";
-                       gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 
-       keys {
+       gpio_keys: keys {
                compatible = "gpio-keys";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -77,12 +65,6 @@
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                };
-
-               rfkill: wifi {
-                       linux,code = <KEY_RFKILL>;
-                       linux,input-type = <EV_SW>;
-                       debounce-interval = <60>;
-               };
        };
 
        gpio-export {
@@ -92,13 +74,13 @@
                gpio_usb1_power {
                        gpio-export,name = "tp-link:power:usb1";
                        gpio-export,output = <1>;
-                       gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
                };
 
                gpio_usb2_power {
                        gpio-export,name = "tp-link:power:usb2";
                        gpio-export,output = <1>;
-                       gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
                };
 
        };
@@ -153,27 +135,10 @@
                reg = <0>;
                spi-max-frequency = <25000000>;
 
-               partitions {
+               mtdparts: partitions {
                        compatible = "fixed-partitions";
                        #address-cells = <1>;
                        #size-cells = <1>;
-
-                       uboot: partition@0 {
-                               label = "u-boot";
-                               reg = <0x000000 0x020000>;
-                               read-only;
-                       };
-
-                       partition@20000 {
-                               label = "firmware";
-                               reg = <0x020000 0xfd0000>;
-                       };
-
-                       art: partition@ff0000 {
-                               label = "art";
-                               reg = <0xff0000 0x010000>;
-                               read-only;
-                       };
                };
        };
 };
@@ -197,27 +162,23 @@
        };
 };
 
-&mdio1 {
-       status = "okay";
-
-       phy1: ethernet-phy@1 {
-               reg = <1>;
-       };
-};
-
 &eth0 {
        status = "okay";
 
        mtd-mac-address = <&uboot 0x1fc00>;
        mtd-mac-address-increment = <1>;
        phy-handle = <&phy0>;
+
+       gmac-config {
+               device = <&gmac>;
+               rgmii-enabled = <1>;
+       };
 };
 
 &eth1 {
        status = "okay";
 
        mtd-mac-address = <&uboot 0x1fc00>;
-       phy-handle = <&phy1>;
 
        fixed-link {
                speed = <1000>;