From c38d4da72c2b112217f76a594d67dfc4d41f0a68 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 30 Mar 2026 19:44:58 -0700
Subject: [PATCH] ath79: ar7161: swap phy0 and phy1

For whatever reason, in the transition from ar71xx to ath79, the second
interface ends up as phy0.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22705
Signed-off-by: Robert Marko <robimarko@gmail.com>
---
 target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi       | 4 ++--
 target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi | 4 ++--
 target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts     | 8 ++++----
 target/linux/ath79/dts/ar7161_netgear_wndr.dtsi          | 4 ++--
 target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi           | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi b/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi
index 3075179b10..fae95afed6 100644
--- a/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi
+++ b/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi
@@ -24,13 +24,13 @@
 		wlan5g {
 			label = "green:wifi5g";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
+			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan2g {
 			label = "green:wifi2g";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
+			linux,default-trigger = "phy1tpt";
 		};
 
 		led_status_green: status_green {
diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
index 3ed7e5d340..0d7b03ef35 100644
--- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
+++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
@@ -41,13 +41,13 @@
 		band2g_g {
 			label = "green:band2g";
 			gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
+			linux,default-trigger = "phy1tpt";
 		};
 
 		band5g_g {
 			label = "green:band5g";
 			gpios = <&ath9k1 1 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
+			linux,default-trigger = "phy0tpt";
 		};
 
 		router {
diff --git a/target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts b/target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts
index b98239915e..3fe9a5590c 100644
--- a/target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts
+++ b/target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts
@@ -69,25 +69,25 @@
 		wlan2g-green {
 			label = "green:wlan2g";
 			gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
+			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan2g-yellow {
 			label = "yellow:wlan2g";
 			gpios = <&ath9k0 3 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0assoc";
+			linux,default-trigger = "phy1assoc";
 		};
 
 		wlan5g-green {
 			label = "green:wlan5g";
 			gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
+			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan5g-yellow {
 			label = "yellow:wlan5g";
 			gpios = <&ath9k1 3 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1assoc";
+			linux,default-trigger = "phy0assoc";
 		};
 	};
 
diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
index de55c08570..5f3cdde4db 100644
--- a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
@@ -67,12 +67,12 @@
 		wlan2g {
 			label = "green:wlan2g";
 			gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
+			linux,default-trigger = "phy1tpt";
 		};
 		wlan5g {
 			label = "blue:wlan5g";
 			gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
+			linux,default-trigger = "phy0tpt";
 		};
 	};
 
diff --git a/target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi b/target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi
index eb3a126964..d64bbe55bf 100644
--- a/target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi
+++ b/target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi
@@ -57,25 +57,25 @@
 		wlan2g-green {
 			label = "green:wlan2g";
 			gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "phy0assoc";
+			linux,default-trigger = "phy1assoc";
 		};
 
 		wlan2g-yellow {
 			label = "yellow:wlan2g";
 			gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "phy0tpt";
+			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g-green {
 			label = "green:wlan5g";
 			gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "phy1assoc";
+			linux,default-trigger = "phy0assoc";
 		};
 
 		wlan5g-yellow {
 			label = "yellow:wlan5g";
 			gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "phy1tpt";
+			linux,default-trigger = "phy0tpt";
 		};
 	};