From: Ohad Ben-Cohen <ohad@wizery.com>
To: <linux-wireless@vger.kernel.org>, <linux-mmc@vger.kernel.org>,
<linux-omap@vger.kernel.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
<linux-arm-kernel@lists.infradead.org>,
Chikkature Rajashekar Madhusudhan <madhu.cr@ti.com>,
Luciano Coelho <luciano.coelho@nokia.com>,
<akpm@linux-foundation.org>, San Mehat <san@google.com>,
Roger Quadros <roger.quadros@nokia.com>,
Tony Lindgren <tony@atomide.com>,
Nicolas Pitre <nico@fluxnic.net>,
Pandita Vikram <vikram.pandita@ti.com>,
Kalle Valo <kalle.valo@iki.fi>, Ohad Ben-Cohen <ohad@wizery.com>
Subject: [PATCH v3 3/9] wireless: wl1271: add platform driver to get board data
Date: Wed, 11 Aug 2010 01:12:22 +0300 [thread overview]
Message-ID: <1281478348-24833-4-git-send-email-ohad@wizery.com> (raw)
In-Reply-To: <1281478348-24833-1-git-send-email-ohad@wizery.com>
Dynamically create and register a platform driver, that will
be used to to receive board-specific information like irq and
reference clock numbers.
The driver is created dynamically in order to avoid the 1-device
limitation of a fixed platform driver name.
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
---
drivers/net/wireless/wl12xx/wl1271.h | 12 ++++
drivers/net/wireless/wl12xx/wl1271_sdio.c | 103 +++++++++++++++++++++++++++--
2 files changed, 108 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index faa5925..013eabb 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -31,6 +31,7 @@
#include <linux/list.h>
#include <linux/bitops.h>
#include <net/mac80211.h>
+#include <linux/platform_device.h>
#include "wl1271_conf.h"
#include "wl1271_ini.h"
@@ -319,8 +320,19 @@ struct wl1271_if_operations {
void (*disable_irq)(struct wl1271 *wl);
};
+/* exact size needed for "wl1271_plat.x" */
+#define WL12XX_PLAT_NAME_LEN 14
+
+struct wl12xx_plat_instance {
+ struct platform_driver pdriver;
+ char name[WL12XX_PLAT_NAME_LEN];
+ struct wl12xx_platform_data *pdata;
+ struct completion data_ready;
+};
+
struct wl1271 {
struct platform_device *plat_dev;
+ struct wl12xx_plat_instance *pinstance;
struct ieee80211_hw *hw;
bool mac80211_registered;
diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c
index c41293a..5b43626 100644
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -28,7 +28,11 @@
#include <linux/mmc/sdio_func.h>
#include <linux/mmc/sdio_ids.h>
#include <linux/mmc/card.h>
+#include <linux/mmc/host.h>
+#include <linux/wl12xx.h>
#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/completion.h>
#include "wl1271.h"
#include "wl12xx_80211.h"
@@ -182,10 +186,84 @@ static struct wl1271_if_operations sdio_ops = {
.disable_irq = wl1271_sdio_disable_interrupts
};
+static int wl1271_plat_probe(struct platform_device *pdev)
+{
+ struct wl12xx_platform_data *pdata;
+ struct platform_driver *pdriver;
+ struct wl12xx_plat_instance *pinstance;
+
+ pdata = pdev->dev.platform_data;
+ if (!pdata) {
+ wl1271_error("no platform data");
+ return -ENODEV;
+ }
+
+ pdriver = container_of(pdev->dev.driver, struct platform_driver,
+ driver);
+ pinstance = container_of(pdriver, struct wl12xx_plat_instance, pdriver);
+
+ pinstance->pdata = pdata;
+
+ complete(&pinstance->data_ready);
+
+ return 0;
+}
+
+static struct wl12xx_platform_data *wl1271_get_data(struct wl1271 *wl, int id)
+{
+ int ret;
+ struct wl12xx_plat_instance *pinstance;
+
+ #define WL1271_PLAT_NAME "wl1271_plat.%d"
+
+ pinstance = kzalloc(sizeof(*pinstance), GFP_KERNEL);
+ if (!pinstance)
+ return ERR_PTR(-ENOMEM);
+
+ init_completion(&pinstance->data_ready);
+
+ pinstance->pdriver.probe = wl1271_plat_probe;
+
+ ret = snprintf(pinstance->name, ARRAY_SIZE(pinstance->name),
+ WL1271_PLAT_NAME, id);
+ if (ret >= WL12XX_PLAT_NAME_LEN) {
+ wl1271_error("truncated plat drv name\n");
+ goto out_free;
+ }
+
+ pinstance->pdriver.driver.name = pinstance->name;
+ pinstance->pdriver.driver.owner = THIS_MODULE;
+
+ ret = platform_driver_register(&pinstance->pdriver);
+ if (ret < 0) {
+ wl1271_error("failed to register plat driver: %d", ret);
+ goto out_free;
+ }
+
+ ret = wait_for_completion_interruptible_timeout(&pinstance->data_ready,
+ msecs_to_jiffies(15000));
+ if (ret <= 0) {
+ wl1271_error("can't get platform device (%d)", ret);
+ ret = (ret == 0 ? -EAGAIN : ret);
+ goto unreg;
+ }
+
+ wl->pinstance = pinstance;
+
+ return pinstance->pdata;
+
+unreg:
+ platform_driver_unregister(&pinstance->pdriver);
+out_free:
+ kfree(pinstance);
+ return ERR_PTR(ret);
+}
+
static int __devinit wl1271_probe(struct sdio_func *func,
const struct sdio_device_id *id)
{
struct ieee80211_hw *hw;
+ struct wl12xx_platform_data *wlan_data;
struct wl1271 *wl;
int ret;
@@ -205,17 +283,24 @@ static int __devinit wl1271_probe(struct sdio_func *func,
/* Grab access to FN0 for ELP reg. */
func->card->quirks |= MMC_QUIRK_LENIENT_FN0;
+ wlan_data = wl1271_get_data(wl, func->card->host->index);
+ if (IS_ERR(wlan_data)) {
+ ret = PTR_ERR(wlan_data);
+ wl1271_error("missing wlan data (needed for irq/ref_clk)!");
+ goto out_free;
+ }
+
wl->irq = gpio_to_irq(RX71_WL1271_IRQ_GPIO);
if (wl->irq < 0) {
ret = wl->irq;
wl1271_error("could not get irq!");
- goto out_free;
+ goto put_data;
}
ret = request_irq(wl->irq, wl1271_irq, 0, DRIVER_NAME, wl);
if (ret < 0) {
wl1271_error("request_irq() failed: %d", ret);
- goto out_free;
+ goto put_data;
}
set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
@@ -236,13 +321,13 @@ static int __devinit wl1271_probe(struct sdio_func *func,
return 0;
- out_irq:
+out_irq:
free_irq(wl->irq, wl);
-
-
- out_free:
+put_data:
+ platform_driver_unregister(&wl->pinstance->pdriver);
+ kfree(wl->pinstance);
+out_free:
wl1271_free_hw(wl);
-
return ret;
}
@@ -253,6 +338,10 @@ static void __devexit wl1271_remove(struct sdio_func *func)
free_irq(wl->irq, wl);
wl1271_unregister_hw(wl);
+
+ platform_driver_unregister(&wl->pinstance->pdriver);
+ kfree(wl->pinstance);
+
wl1271_free_hw(wl);
}
--
1.7.0.4
next prev parent reply other threads:[~2010-08-10 22:19 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-10 22:12 [PATCH v3 0/9] native support for wl1271 on ZOOM Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 1/9] wireless: wl1271: make wl12xx.h common to both spi and sdio Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 2/9] wireless: wl1271: support return value for the set power func Ohad Ben-Cohen
2010-08-10 22:12 ` Ohad Ben-Cohen [this message]
2010-08-10 22:12 ` [PATCH v3 4/9] wireless: wl1271: take irq info from private board data Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 5/9] wireless: wl1271: make ref_clock configurable by board Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 6/9] omap: hsmmc: remove unused variable Ohad Ben-Cohen
2010-08-11 9:55 ` Adrian Hunter
2010-08-11 10:08 ` Ohad Ben-Cohen
2010-08-11 10:28 ` Adrian Hunter
2010-08-10 22:12 ` [PATCH v3 7/9] omap: zoom: add fixed regulator device for wlan Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 8/9] omap: hsmmc: split mmc23 power control Ohad Ben-Cohen
2010-08-11 8:30 ` Roger Quadros
2010-08-11 10:05 ` Adrian Hunter
2010-08-11 10:52 ` Roger Quadros
2010-08-11 11:01 ` Ohad Ben-Cohen
2010-08-11 16:01 ` Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 9/9] omap: zoom: add mmc3/wl1271 device support Ohad Ben-Cohen
2010-08-11 8:37 ` Roger Quadros
2010-08-11 9:01 ` Roger Quadros
2010-08-11 15:38 ` Ohad Ben-Cohen
2010-08-11 15:38 ` Ohad Ben-Cohen
2010-08-11 20:09 ` kishore kadiyala
2010-08-11 20:12 ` Ohad Ben-Cohen
2010-08-11 20:18 ` kishore kadiyala
2010-08-11 21:03 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1281478348-24833-4-git-send-email-ohad@wizery.com \
--to=ohad@wizery.com \
--cc=akpm@linux-foundation.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=kalle.valo@iki.fi \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@nokia.com \
--cc=madhu.cr@ti.com \
--cc=nico@fluxnic.net \
--cc=roger.quadros@nokia.com \
--cc=san@google.com \
--cc=tony@atomide.com \
--cc=vikram.pandita@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).