generic: v6.1, v6.6: add patch to fix PHY-muxing on MT7530

[openwrt/openwrt.git] / target / linux / ath79 / dts / ar9341_tplink_tl-wr842n-v2.dts

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
index f2dbac3c7ca87dd7b6361533de69fd660cfe51b1..3efd8242469b0b8d35986bf20e26081cf39b1c32 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
@@ -1,36 +1,19 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
-#include "ar9341.dtsi"
+#include "ar9341_tplink.dtsi"
 
 / {
        model = "TP-Link TL-WR842N/ND v2";
-       compatible = "tplink,tl-wr842n-v2";
+       compatible = "tplink,tl-wr842n-v2", "qca,ar9341";
 
        aliases {
-               serial0 = &uart;
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               label-mac-device = &wmac;
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&jtag_disable_pins>;
-
-               reset {
-                       label = "Reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
+               compatible = "gpio-keys";
 
                rfkill {
                        label = "WiFi";
@@ -38,66 +21,12 @@
                        gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
                        debounce-interval = <60>;
                };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               system: power {
-                       label = "tp-link:green:power";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-                       default-state = "on";
-               };
-
-               wlan {
-                       label = "tp-link:green:wlan";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-                       linux,default-trigger = "phy0tpt";
-               };
-
-               qss {
-                       label = "tp-link:green:qss";
-                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
-
-               wan {
-                       label = "tp-link:green:wan";
-                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
-
-               lan1 {
-                       label = "tp-link:green:lan1";
-                       gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
-
-               lan2 {
-                       label = "tp-link:green:lan2";
-                       gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
-
-               lan3 {
-                       label = "tp-link:green:lan3";
-                       gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
-
-               lan4 {
-                       label = "tp-link:green:lan4";
-                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
 
-               usb {
-                       label = "tp-link:green:usb";
-                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-                       trigger-sources = <&hub_port>;
-                       linux,default-trigger = "usbport";
+               reset {
+                       label = "Reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
                };
        };
 
@@ -112,21 +41,17 @@
        };
 };
 
-&ref {
-       clock-frequency = <25000000>;
-};
-
-&uart {
-       status = "okay";
-};
-
-&gpio {
-       status = "okay";
+&leds {
+       usb {
+               function = LED_FUNCTION_USB;
+               color = <LED_COLOR_ID_GREEN>;
+               gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+               trigger-sources = <&hub_port>;
+               linux,default-trigger = "usbport";
+       };
 };
 
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
        flash@0 {
@@ -143,9 +68,22 @@
                                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 {
+                               compatible = "tplink,firmware";
                                label = "firmware";
                                reg = <0x020000 0x7d0000>;
                        };
@@ -160,14 +98,7 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {
@@ -175,30 +106,20 @@
 };
 
 &eth0 {
-       status = "okay";
-
-       phy-handle = <&swphy0>;
-       mtd-mac-address = <&uboot 0x1fc00>;
-       mtd-mac-address-increment = <(-1)>;
+       nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       status = "okay";
-
        phy-handle = <&swphy4>;
-       mtd-mac-address = <&uboot 0x1fc00>;
-       phy-mode = "gmii";
-       pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       gmac-config {
-               device = <&gmac>;
-               switch-phy-swap = <1>;
-       };
+       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";
 };