OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wlcore: add device-tree support 

When running with device-tree, we no longer have a board file
that can set up the platform data for wlcore.
Allow this data to be passed from DT.

Signed-off-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Tested-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Eliad Peller 2015-03-18 18:38:28 +02:00 committed by Tony Lindgren
parent d96c8b7740
commit 5ea5c518cc
1 changed files with 87 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
drivers/net/wireless/ti/wlcore/sdio.c
View File

@ -34,6 +34,8 @@
#include <linux/wl12xx.h>
#include <linux/pm_runtime.h>
#include <linux/printk.h>
#include <linux/of.h>
#include <linux/of_irq.h>
#include "wlcore.h"
#include "wl12xx_80211.h"
@ -214,6 +216,82 @@ static struct wl1271_if_operations sdio_ops = {
.set_block_size = wl1271_sdio_set_block_size,
};
#ifdef CONFIG_OF
static const struct of_device_id wlcore_sdio_of_match_table[] = {
{ .compatible = "ti,wl1271" },
{ .compatible = "ti,wl1273" },
{ .compatible = "ti,wl1281" },
{ .compatible = "ti,wl1283" },
{ .compatible = "ti,wl1801" },
{ .compatible = "ti,wl1805" },
{ .compatible = "ti,wl1807" },
{ .compatible = "ti,wl1831" },
{ .compatible = "ti,wl1835" },
{ .compatible = "ti,wl1837" },
{ }
};
static struct wl12xx_platform_data *wlcore_probe_of(struct device *dev)
{
struct device_node *np = dev->of_node;
struct wl12xx_platform_data *pdata;
if (!np || !of_match_node(wlcore_sdio_of_match_table, np))
return NULL;
pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
if (!pdata)
return NULL;
pdata->irq = irq_of_parse_and_map(np, 0);
if (!pdata->irq) {
dev_err(dev, "No irq in platform data\n");
kfree(pdata);
return NULL;
}
pdata->irq_trigger =
irqd_get_trigger_type(irq_get_irq_data(pdata->irq));
/* optional clock frequency params */
of_property_read_u32(np, "ref-clock-frequency",
&pdata->ref_clock_freq);
of_property_read_u32(np, "tcxo-clock-frequency",
&pdata->tcxo_clock_freq);
return pdata;
}
#else
static struct wl12xx_platform_data *wlcore_probe_of(struct device *dev)
{
return NULL;
}
#endif
static struct wl12xx_platform_data *
wlcore_get_platform_data(struct device *dev)
{
struct wl12xx_platform_data *pdata;
/* first, look for DT data */
pdata = wlcore_probe_of(dev);
if (pdata)
return pdata;
/* if not found - fallback to static platform data */
pdata = wl12xx_get_platform_data();
if (!IS_ERR(pdata))
return kmemdup(pdata, sizeof(*pdata), GFP_KERNEL);
dev_err(dev, "No platform data set\n");
return NULL;
}
static void wlcore_del_platform_data(struct wl12xx_platform_data *pdata)
{
kfree(pdata);
}
static int wl1271_probe(struct sdio_func *func,
const struct sdio_device_id *id)
{
@ -245,12 +323,9 @@ static int wl1271_probe(struct sdio_func *func,
/* Use block mode for transferring over one block size of data */
func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;
pdev_data.pdata = wl12xx_get_platform_data();
if (IS_ERR(pdev_data.pdata)) {
ret = PTR_ERR(pdev_data.pdata);
dev_err(glue->dev, "missing wlan platform data: %d\n", ret);
pdev_data.pdata = wlcore_get_platform_data(&func->dev);
if (!pdev_data.pdata)
goto out_free_glue;
}
/* if sdio can keep power while host is suspended, enable wow */
mmcflags = sdio_get_host_pm_caps(func);
@ -279,7 +354,7 @@ static int wl1271_probe(struct sdio_func *func,
if (!glue->core) {
dev_err(glue->dev, "can't allocate platform_device");
ret = -ENOMEM;
goto out_free_glue;
goto out_free_pdata;
}
glue->core->dev.parent = &func->dev;
@ -313,6 +388,9 @@ static int wl1271_probe(struct sdio_func *func,
out_dev_put:
platform_device_put(glue->core);
out_free_pdata:
wlcore_del_platform_data(pdev_data.pdata);
out_free_glue:
kfree(glue);
@ -323,11 +401,14 @@ out:
static void wl1271_remove(struct sdio_func *func)
{
struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
struct wlcore_platdev_data *pdev_data = glue->core->dev.platform_data;
struct wl12xx_platform_data *pdata = pdev_data->pdata;
/* Undo decrement done above in wl1271_probe */
pm_runtime_get_noresume(&func->dev);
platform_device_unregister(glue->core);
wlcore_del_platform_data(pdata);
kfree(glue);
}