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>

diff --git a/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi b/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi
index 3075179b10c09456b598f6e035184e1f632b3719..fae95afed64c3f87ba90eff408dd0a3be812a68b 100644 (file)
--- 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 3ed7e5d3404d317b0c1e1515d7c4f0281fc1c99a..0d7b03ef3503554e0ae9fc3660e18dc7fef9c4a2 100644 (file)
--- 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 b98239915edbfe5e3185345f76972e89a24318e1..3fe9a5590c627242a70df9a43167cda31a188385 100644 (file)
--- 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 de55c085700e9481f5ffd51a34ce787f7f7f318c..5f3cdde4dba3b7f82691e2ca17a96376b6849556 100644 (file)
--- 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 eb3a12696420384476bb9b4cf31e16d469af2460..d64bbe55bfdeaa8a78a67c54cf405ac211a603ed 100644 (file)
--- 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";
                };
        };