| Message ID | 1372776948-24840-9-git-send-email-coelho@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Tue, Jul 02, 2013 at 05:55:47PM +0300, Luciano Coelho wrote: > @@ -294,6 +316,8 @@ 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; > > + sdio_set_drvdata(func, glue); is this move really necessary ?
On Tue, 2013-07-02 at 18:35 +0300, Felipe Balbi wrote: > Hi, > > On Tue, Jul 02, 2013 at 05:55:47PM +0300, Luciano Coelho wrote: > > @@ -294,6 +316,8 @@ 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; > > > > + sdio_set_drvdata(func, glue); > > is this move really necessary ? It is, because I use the glue in wlcore_get_pdata_from_of(), so I need to call sdio_set_drvdata() earlier. I reckoned it wouldn't hurt to move this, so I wouldn't have to pass the glue in the wlcore_get_pdata_from_of() call. -- Luca. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jul 02, 2013 at 11:19:54PM +0300, Luciano Coelho wrote: > On Tue, 2013-07-02 at 18:35 +0300, Felipe Balbi wrote: > > Hi, > > > > On Tue, Jul 02, 2013 at 05:55:47PM +0300, Luciano Coelho wrote: > > > @@ -294,6 +316,8 @@ 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; > > > > > > + sdio_set_drvdata(func, glue); > > > > is this move really necessary ? > > It is, because I use the glue in wlcore_get_pdata_from_of(), so I need > to call sdio_set_drvdata() earlier. I reckoned it wouldn't hurt to move > this, so I wouldn't have to pass the glue in the > wlcore_get_pdata_from_of() call. that's alright, it does look like it deserves a mention in changelog though. Other than that: Reviewed-by: Felipe Balbi <balbi@ti.com>
On Wed, 2013-07-03 at 00:32 +0300, Felipe Balbi wrote: > On Tue, Jul 02, 2013 at 11:19:54PM +0300, Luciano Coelho wrote: > > On Tue, 2013-07-02 at 18:35 +0300, Felipe Balbi wrote: > > > Hi, > > > > > > On Tue, Jul 02, 2013 at 05:55:47PM +0300, Luciano Coelho wrote: > > > > @@ -294,6 +316,8 @@ 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; > > > > > > > > + sdio_set_drvdata(func, glue); > > > > > > is this move really necessary ? > > > > It is, because I use the glue in wlcore_get_pdata_from_of(), so I need > > to call sdio_set_drvdata() earlier. I reckoned it wouldn't hurt to move > > this, so I wouldn't have to pass the glue in the > > wlcore_get_pdata_from_of() call. > > that's alright, it does look like it deserves a mention in changelog > though. Other than that: Uh, ok. This was so tiny (and I thought so obvious) a change that I didn't mention it. But if you asked about it, it was not obvious enough. ;) I'll add a small comment about it in the commit message. > Reviewed-by: Felipe Balbi <balbi@ti.com> Thanks! -- Luca. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c index 980bf3d..60fce49 100644 --- a/drivers/net/wireless/ti/wlcore/sdio.c +++ b/drivers/net/wireless/ti/wlcore/sdio.c @@ -53,6 +53,7 @@ static bool dump = false; struct wl12xx_sdio_glue { struct device *dev; struct platform_device *core; + struct clk *refclock, *tcxoclock; }; static const struct sdio_device_id wl1271_devices[] = { @@ -224,6 +225,7 @@ static struct wl12xx_platform_data *wlcore_get_pdata_from_of(struct device *dev) struct wl12xx_platform_data *pdata; struct device_node *np = dev->of_node; struct device_node *clock_node; + struct wl12xx_sdio_glue *glue = sdio_get_drvdata(dev_to_sdio_func(dev)); if (!np) { np = of_find_matching_node(NULL, dev->driver->of_match_table); @@ -250,6 +252,26 @@ static struct wl12xx_platform_data *wlcore_get_pdata_from_of(struct device *dev) for_each_matching_node(clock_node, wlcore_sdio_of_clk_match_table) of_fixed_clk_setup(clock_node); + /* TODO: make sure we have this when needed (ie. for WL6 and WL7) */ + glue->refclock = of_clk_get_by_name(np, "refclock"); + if (IS_ERR(glue->refclock)) { + dev_err(dev, "couldn't find refclock on the device tree\n"); + glue->refclock = NULL; + } else { + clk_prepare_enable(glue->refclock); + pdata->ref_clock_freq = clk_get_rate(glue->refclock); + } + + /* TODO: make sure we have this when needed (ie. for WL7) */ + glue->tcxoclock = of_clk_get_by_name(np, "tcxoclock"); + if (IS_ERR(glue->tcxoclock)) { + dev_err(dev, "couldn't find tcxoclock on the device tree\n"); + glue->tcxoclock = NULL; + } else { + clk_prepare_enable(glue->tcxoclock); + pdata->ref_clock_freq = clk_get_rate(glue->tcxoclock); + } + goto out; out_free: @@ -294,6 +316,8 @@ 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; + sdio_set_drvdata(func, glue); + /* The pdata allocated here is freed when the device is freed, * so we don't need an additional out label to free it in case * of error further on. @@ -319,8 +343,6 @@ static int wl1271_probe(struct sdio_func *func, if (mmcflags & MMC_PM_KEEP_POWER) pdev_data->pwr_in_suspend = true; - sdio_set_drvdata(func, glue); - /* Tell PM core that we don't need the card to be powered now */ pm_runtime_put_noidle(&func->dev); @@ -387,6 +409,16 @@ static void wl1271_remove(struct sdio_func *func) { struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func); + if (glue->refclock) { + clk_disable_unprepare(glue->refclock); + clk_put(glue->refclock); + } + + if (glue->tcxoclock) { + clk_disable_unprepare(glue->tcxoclock); + clk_put(glue->tcxoclock); + } + /* Undo decrement done above in wl1271_probe */ pm_runtime_get_noresume(&func->dev);
Read the clock nodes from the device tree and use them to set the frequency for the refclock and the tcxo clock. Signed-off-by: Luciano Coelho <coelho@ti.com> --- drivers/net/wireless/ti/wlcore/sdio.c | 36 +++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)