[openwrt/openwrt] mediatek: fiilogic: device tree `switch at 1f` fix

LEDE Commits lede-commits at lists.infradead.org
Tue Dec 12 00:59:33 PST 2023


rmilecki pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/b95e9dae43dfc7b6d3c1b4a031a23643a96246f6

commit b95e9dae43dfc7b6d3c1b4a031a23643a96246f6
Author: Rani Hod <rani.hod at gmail.com>
AuthorDate: Wed Nov 22 19:38:06 2023 +0200

    mediatek: fiilogic: device tree `switch at 1f` fix
    
    Quite a few `fiilogic` devices use the `mt7531` switch.
    Some of them have a DT node that looks like:
    ```
    switch: switch at 0 {
            compatible = "mediatek,mt7531";
            reg = <31>;
    ...
    };
    ```
    This commit changes the DT node name to `switch at 1f`.
    
    Signed-off-by: Rani Hod <rani.hod at gmail.com>
    (cherry picked from commit aaeb379023daf9720303884f61748fe362b0a237)
---
 target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts                   | 2 +-
 target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts                   | 2 +-
 target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts                  | 2 +-
 target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts              | 2 +-
 target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts                     | 2 +-
 target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts                     | 2 +-
 target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi         | 2 +-
 target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts                | 2 +-
 target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts                 | 4 ++--
 target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts                 | 4 ++--
 target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts                | 2 +-
 target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi           | 2 +-
 target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi     | 2 +-
 target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts           | 2 +-
 target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1.dts               | 2 +-
 .../arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts          | 2 +-
 .../mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi | 2 +-
 .../mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts  | 2 +-
 18 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts
index d39083ffb0..ae4404466e 100644
--- a/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts
+++ b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts
@@ -77,7 +77,7 @@
 };
 
 &mdio_bus {
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 		reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts
index e9c850e85b..3f330f40fa 100644
--- a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts
+++ b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts
@@ -90,7 +90,7 @@
 };
 
 &mdio_bus {
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 		reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
index 7975d247b1..56e90b1722 100644
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
@@ -112,7 +112,7 @@
 };
 
 &mdio_bus {
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 		reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
index 671e1f1839..de702d4a53 100644
--- a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
@@ -81,7 +81,7 @@
 };
 
 &mdio_bus {
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 		reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts b/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
index adb86d9ebd..d85c6e4651 100644
--- a/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
@@ -72,7 +72,7 @@
 };
 
 &mdio_bus {
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 		reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts b/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
index d897697ef2..cd6f6b30c3 100644
--- a/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
+++ b/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
@@ -74,7 +74,7 @@
 };
 
 &mdio_bus {
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 		reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi
index 7ab94f3623..d09ae2a3e7 100644
--- a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi
@@ -86,7 +86,7 @@
 };
 
 &mdio_bus {
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 		reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts b/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts
index 35a2c30bb4..6bff786558 100644
--- a/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts
+++ b/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts
@@ -229,7 +229,7 @@
 		mxl,led-config = <0x0 0x0 0x370 0x80>;
 	};
 
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 
diff --git a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
index ac854f10d1..2af18958bc 100644
--- a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
@@ -136,7 +136,7 @@
 		mxl,led-config = <0x03f0 0x0 0x0 0x0>;
 	};
 
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 
@@ -361,4 +361,4 @@
 
 &usb_phy {
 	status = "okay";
-};
\ No newline at end of file
+};
diff --git a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
index 2e9114f99c..41e6d2471d 100644
--- a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
@@ -142,7 +142,7 @@
 		mxl,led-config = <0x03f0 0x0 0x0 0x0>;
 	};
 
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 
@@ -379,4 +379,4 @@
 
 &usb_phy {
 	status = "okay";
-};
\ No newline at end of file
+};
diff --git a/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts b/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
index 2be1907f63..fded507039 100644
--- a/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
+++ b/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
@@ -122,7 +122,7 @@
 			realtek,aldps-enable;
 		};
 
-		switch: switch at 31 {
+		switch: switch at 1f {
 			compatible = "mediatek,mt7531";
 			reg = <31>;
 			reset-gpios = <&pio 18 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
index a1910e36d2..ddf332a0dc 100644
--- a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
@@ -141,7 +141,7 @@
 		realtek,aldps-enable;
 	};
 
-	switch: switch at 31 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 		reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
index a9b44f8df9..b2711eb7d7 100644
--- a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
@@ -72,7 +72,7 @@
 };
 
 &mdio {
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 		reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
index 2469d3d77d..331150d85d 100644
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
@@ -199,7 +199,7 @@
 			reg = <6>;
 		};
 
-		switch at 0 {
+		switch at 1f {
 			compatible = "mediatek,mt7531";
 			reg = <31>;
 			reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1.dts b/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1.dts
index 89ec613a8d..42250be19a 100644
--- a/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1.dts
+++ b/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1.dts
@@ -120,7 +120,7 @@
 		reg = <6>;
 	};
 
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 		reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
index 1d3c575b7d..d326c416a9 100644
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
@@ -200,7 +200,7 @@
 };
 
 &mdio {
-	switch: switch at 31 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 		interrupt-controller;
diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
index 1ab56e37f7..26d560bd4b 100644
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
@@ -99,7 +99,7 @@
 		reg = <6>;
 	};
 
-	switch: switch at 0 {
+	switch: switch at 1f {
 		compatible = "mediatek,mt7531";
 		reg = <31>;
 		reset-gpios = <&pio 5 0>;
diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
index 83d5191671..8cd094f7c3 100644
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
@@ -108,7 +108,7 @@
 			phy-mode = "2500base-x";
 		};
 
-		switch at 0 {
+		switch at 1f {
 			compatible = "mediatek,mt7531";
 			reg = <31>;
 			reset-gpios = <&pio 5 0>;




More information about the lede-commits mailing list