github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wifi: ath9k: ahb: replace id_table with of

Browse Source 
Since 2b0996c764 , all of this platform code became no-op with no OF
replacement. Not only that, there are no users of AHB here. Add an OF
match table that mostly mirrors the original platform device id table.
Use a qca prefix as is done for the only other property: qca,no-eeprom.
Also used qca prefix for ar9530 as the latter seems to be a mistake.

This will be used to add ath9k support for the various ath79 devices
here.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Link: https://patch.msgid.link/20250609030851.17739-5-rosenp@gmail.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
This commit is contained in:
Rosen Penev 2025-06-08 20:08:50 -07:00 committed by Jeff Johnson
parent f902f2c39a
commit 2fa490c0d7
1 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/net/wireless/ath/ath9k/ahb.c
View File

@ -19,35 +19,18 @@
#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/nl80211.h>
#include <linux/of.h>
#include <linux/platform_device.h>
#include "ath9k.h"
static const struct platform_device_id ath9k_platform_id_table[] = {
{
.name = "ath9k",
.driver_data = AR5416_AR9100_DEVID,
},
{
.name = "ar933x_wmac",
.driver_data = AR9300_DEVID_AR9330,
},
{
.name = "ar934x_wmac",
.driver_data = AR9300_DEVID_AR9340,
},
{
.name = "qca955x_wmac",
.driver_data = AR9300_DEVID_QCA955X,
},
{
.name = "qca953x_wmac",
.driver_data = AR9300_DEVID_AR953X,
},
{
.name = "qca956x_wmac",
.driver_data = AR9300_DEVID_QCA956X,
},
static const struct of_device_id ath9k_of_match_table[] = {
{ .compatible = "qca,ar9130-wifi", .data = (void *)AR5416_AR9100_DEVID },
{ .compatible = "qca,ar9330-wifi", .data = (void *)AR9300_DEVID_AR9330 },
{ .compatible = "qca,ar9340-wifi", .data = (void *)AR9300_DEVID_AR9340 },
{ .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 },
{},
};
@ -72,20 +55,15 @@ static const struct ath_bus_ops ath_ahb_bus_ops = {
static int ath_ahb_probe(struct platform_device *pdev)
{
const struct platform_device_id *id = platform_get_device_id(pdev);
struct ieee80211_hw *hw;
struct ath_softc *sc;
struct ath_hw *ah;
void __iomem *mem;
char hw_name[64];
u16 dev_id;
int irq;
int ret;
if (!dev_get_platdata(&pdev->dev)) {
dev_err(&pdev->dev, "no platform data specified\n");
return -EINVAL;
}
mem = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(mem)) {
dev_err(&pdev->dev, "ioremap failed\n");
@ -118,7 +96,8 @@ static int ath_ahb_probe(struct platform_device *pdev)
goto err_free_hw;
}
ret = ath9k_init_device(id->driver_data, sc, &ath_ahb_bus_ops);
dev_id = (u16)(kernel_ulong_t)of_device_get_match_data(&pdev->dev);
ret = ath9k_init_device(dev_id, sc, &ath_ahb_bus_ops);
if (ret) {
dev_err(&pdev->dev, "failed to initialize device\n");
goto err_irq;
@ -156,11 +135,11 @@ static struct platform_driver ath_ahb_driver = {
.remove = ath_ahb_remove,
.driver = {
.name = "ath9k",
.of_match_table = ath9k_of_match_table,
},
.id_table = ath9k_platform_id_table,
};
MODULE_DEVICE_TABLE(platform, ath9k_platform_id_table);
MODULE_DEVICE_TABLE(of, ath9k_of_match_table);
int ath_ahb_init(void)
{