From 7e09959efda2019c28856cfba157f04e8db62f42 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 6 Jul 2025 12:07:23 -0700 Subject: [PATCH] mac80211: fix wmac node names The upstream submission for this mandates the node to be named wifi instead of wmac. Change all ath79 entries to match the new names and remove the compatibility patch. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/19328 Signed-off-by: Robert Marko --- .../patches/ath9k/553-ath9k-ahb_of_compat.patch | 16 ---------------- .../files-ucode/usr/share/wifi_devices.json | 12 ++++++------ target/linux/ath79/dts/ar9132.dtsi | 4 ++-- target/linux/ath79/dts/ar9330.dtsi | 4 ++-- target/linux/ath79/dts/ar934x.dtsi | 4 ++-- target/linux/ath79/dts/qca953x.dtsi | 4 ++-- target/linux/ath79/dts/qca955x.dtsi | 4 ++-- target/linux/ath79/dts/qca956x.dtsi | 4 ++-- 8 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 package/kernel/mac80211/patches/ath9k/553-ath9k-ahb_of_compat.patch diff --git a/package/kernel/mac80211/patches/ath9k/553-ath9k-ahb_of_compat.patch b/package/kernel/mac80211/patches/ath9k/553-ath9k-ahb_of_compat.patch deleted file mode 100644 index 20e351d203..0000000000 --- a/package/kernel/mac80211/patches/ath9k/553-ath9k-ahb_of_compat.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/ahb.c -+++ b/drivers/net/wireless/ath/ath9k/ahb.c -@@ -31,6 +31,13 @@ static const struct of_device_id ath9k_o - { .compatible = "qca,qca9530-wifi", .data = (void *)AR9300_DEVID_AR953X }, - { .compatible = "qca,qca9550-wifi", .data = (void *)AR9300_DEVID_QCA955X }, - { .compatible = "qca,qca9560-wifi", .data = (void *)AR9300_DEVID_QCA956X }, -+ /* backwards compat, remove if no longer needed: */ -+ { .compatible = "qca,ar9130-wmac", .data = (void *)AR5416_AR9100_DEVID }, -+ { .compatible = "qca,ar9330-wmac", .data = (void *)AR9300_DEVID_AR9330 }, -+ { .compatible = "qca,ar9340-wmac", .data = (void *)AR9300_DEVID_AR9340 }, -+ { .compatible = "qca,qca9530-wmac", .data = (void *)AR9300_DEVID_AR953X }, -+ { .compatible = "qca,qca9550-wmac", .data = (void *)AR9300_DEVID_QCA955X }, -+ { .compatible = "qca,qca9560-wmac", .data = (void *)AR9300_DEVID_QCA956X }, - {}, - }; - diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/wifi_devices.json b/package/network/config/wifi-scripts/files-ucode/usr/share/wifi_devices.json index d1331efee6..64218b6e4f 100644 --- a/package/network/config/wifi-scripts/files-ucode/usr/share/wifi_devices.json +++ b/package/network/config/wifi-scripts/files-ucode/usr/share/wifi_devices.json @@ -238,12 +238,12 @@ [ "0x0000", "0x0000", "0x0bda", "0xf179", 0, 0, "Realtek", "RTL8188FTV" ] ], "compatible": { - "qca,ar9130-wmac": [ "Atheros", "AR9130" ], - "qca,ar9330-wmac": [ "Atheros", "AR9330" ], - "qca,ar9340-wmac": [ "Atheros", "AR9340" ], - "qca,qca9530-wmac": [ "Qualcomm Atheros", "QCA9530" ], - "qca,qca9550-wmac": [ "Qualcomm Atheros", "QCA9550" ], - "qca,qca9560-wmac": [ "Qualcomm Atheros", "QCA9560" ], + "qca,ar9130-wifi": [ "Atheros", "AR9130" ], + "qca,ar9330-wifi": [ "Atheros", "AR9330" ], + "qca,ar9340-wifi": [ "Atheros", "AR9340" ], + "qca,qca9530-wifi": [ "Qualcomm Atheros", "QCA9530" ], + "qca,qca9550-wifi": [ "Qualcomm Atheros", "QCA9550" ], + "qca,qca9560-wifi": [ "Qualcomm Atheros", "QCA9560" ], "qcom,ipq4019-wifi": [ "Qualcomm Atheros", "IPQ4019" ], "qcom,ipq6018-wifi": [ "Qualcomm Atheros", "IPQ6018" ], "qcom,ipq8074-wifi": [ "Qualcomm Atheros", "IPQ8074" ], diff --git a/target/linux/ath79/dts/ar9132.dtsi b/target/linux/ath79/dts/ar9132.dtsi index 2ea689fac1..38e7798883 100644 --- a/target/linux/ath79/dts/ar9132.dtsi +++ b/target/linux/ath79/dts/ar9132.dtsi @@ -175,8 +175,8 @@ #size-cells = <0>; }; - wmac: wmac@180c0000 { - compatible = "qca,ar9130-wmac"; + wmac: wifi@180c0000 { + compatible = "qca,ar9130-wifi"; reg = <0x180c0000 0x230000>; interrupts = <2>; diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi index e4d78b9251..09e1d29396 100644 --- a/target/linux/ath79/dts/ar9330.dtsi +++ b/target/linux/ath79/dts/ar9330.dtsi @@ -152,8 +152,8 @@ reg = <0x18070000 0x4>; }; - wmac: wmac@18100000 { - compatible = "qca,ar9330-wmac"; + wmac: wifi@18100000 { + compatible = "qca,ar9330-wifi"; reg = <0x18100000 0x20000>; interrupts = <2>; diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi index b2106fcdaa..586eecff7f 100644 --- a/target/linux/ath79/dts/ar934x.dtsi +++ b/target/linux/ath79/dts/ar934x.dtsi @@ -153,8 +153,8 @@ reg = <0x18070000 0x14>; }; - wmac: wmac@18100000 { - compatible = "qca,ar9340-wmac"; + wmac: wifi@18100000 { + compatible = "qca,ar9340-wifi"; reg = <0x18100000 0x20000>; status = "disabled"; diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi index 782b0949ca..f3a9d59fb8 100644 --- a/target/linux/ath79/dts/qca953x.dtsi +++ b/target/linux/ath79/dts/qca953x.dtsi @@ -177,8 +177,8 @@ status = "disabled"; }; - wmac: wmac@18100000 { - compatible = "qca,qca9530-wmac"; + wmac: wifi@18100000 { + compatible = "qca,qca9530-wifi"; reg = <0x18100000 0x20000>; interrupt-parent = <&intc2>; diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi index d697b04769..002a5c518a 100644 --- a/target/linux/ath79/dts/qca955x.dtsi +++ b/target/linux/ath79/dts/qca955x.dtsi @@ -229,8 +229,8 @@ status = "disabled"; }; - wmac: wmac@18100000 { - compatible = "qca,qca9550-wmac"; + wmac: wifi@18100000 { + compatible = "qca,qca9550-wifi"; reg = <0x18100000 0x10000>; interrupt-parent = <&intc2>; diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi index 8070fefbb7..ab7c55ab1a 100644 --- a/target/linux/ath79/dts/qca956x.dtsi +++ b/target/linux/ath79/dts/qca956x.dtsi @@ -147,8 +147,8 @@ reg = <0x18070000 0x64>; }; - wmac: wmac@18100000 { - compatible = "qca,qca9560-wmac"; + wmac: wifi@18100000 { + compatible = "qca,qca9560-wifi"; reg = <0x18100000 0x10000>; interrupt-parent = <&cpuintc>;