Re: [PATCH 2/7] ath9k: ahb: Add OF support

[Sergei Shtylyov]

Hello!

On 3/14/2017 12:05 AM, Alban wrote:


Allow registering ath9k AHB devices defined in DT. This just add the
compatible strings to allow matching the driver and setting the proper
device ID.

Signed-off-by: Alban 
---
 drivers/net/wireless/ath/ath9k/ahb.c | 47 +---
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/ahb.c 
b/drivers/net/wireless/ath/ath9k/ahb.c
index 2bd982c..36a2645 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c

[...]

@@ -79,10 +107,20 @@ static int ath_ahb_probe(struct platform_device *pdev)
int ret = 0;
struct ath_hw *ah;
char hw_name[64];
+   u16 devid;

-   if (!dev_get_platdata(>dev)) {
-   dev_err(>dev, "no platform data specified\n");
-   return -EINVAL;
+   if (id) {
+   devid = id->driver_data;
+   } else {
+   const struct of_device_id *match;
+
+   match = of_match_device(ath_ahb_of_match, >dev);
+   if (!match) {
+   dev_err(>dev, "no device match found\n");
+   return -EINVAL;
+   }
+
+   devid = (u16)(unsigned long)match->data;


   of_device_get_match_data() instead of the above perhaps?

[...]

MBR, Sergei

[PATCH 2/7] ath9k: ahb: Add OF support

[Alban]

Allow registering ath9k AHB devices defined in DT. This just add the
compatible strings to allow matching the driver and setting the proper
device ID.

Signed-off-by: Alban 
---
 drivers/net/wireless/ath/ath9k/ahb.c | 47 +---
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/ahb.c 
b/drivers/net/wireless/ath/ath9k/ahb.c
index 2bd982c..36a2645 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -18,6 +18,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include "ath9k.h"
 
@@ -49,6 +50,33 @@ static const struct platform_device_id 
ath9k_platform_id_table[] = {
{},
 };
 
+#ifdef CONFIG_OF
+static const struct of_device_id ath_ahb_of_match[] = {
+   {
+   .compatible = "qca,ar9100-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,qca9550-wmac",
+   .data = (void *)AR9300_DEVID_QCA955X
+   },
+   {
+   .compatible = "qca,qca9530-wmac",
+   .data = (void *)AR9300_DEVID_AR953X
+   },
+   {},
+};
+MODULE_DEVICE_TABLE(of, ath_ahb_of_match);
+#endif
+
 /* return bus cachesize in 4B word units */
 static void ath_ahb_read_cachesize(struct ath_common *common, int *csz)
 {
@@ -79,10 +107,20 @@ static int ath_ahb_probe(struct platform_device *pdev)
int ret = 0;
struct ath_hw *ah;
char hw_name[64];
+   u16 devid;
 
-   if (!dev_get_platdata(>dev)) {
-   dev_err(>dev, "no platform data specified\n");
-   return -EINVAL;
+   if (id) {
+   devid = id->driver_data;
+   } else {
+   const struct of_device_id *match;
+
+   match = of_match_device(ath_ahb_of_match, >dev);
+   if (!match) {
+   dev_err(>dev, "no device match found\n");
+   return -EINVAL;
+   }
+
+   devid = (u16)(unsigned long)match->data;
}
 
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -127,7 +165,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
goto err_free_hw;
}
 
-   ret = ath9k_init_device(id->driver_data, sc, _ahb_bus_ops);
+   ret = ath9k_init_device(devid, sc, _ahb_bus_ops);
if (ret) {
dev_err(>dev, "failed to initialize device\n");
goto err_irq;
@@ -167,6 +205,7 @@ static struct platform_driver ath_ahb_driver = {
.remove = ath_ahb_remove,
.driver = {
.name   = "ath9k",
+   .of_match_table = of_match_ptr(ath_ahb_of_match),
},
.id_table= ath9k_platform_id_table,
 };
-- 
2.7.4