system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

sh-pfc: Support passing resources through platform device

Browse source 
Resources should be passed through the platform device, not through
platform data. Default to platform device resources and fall back to
platform data resources if not available.

Support for platform data resources will be removed when arch code will
be converted.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Laurent Pinchart 2012-12-15 23:50:55 +01:00 committed by Simon Horman
parent 40ee6fce7a
commit 973931ae0a
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/sh/pfc/core.c
View file

@ -26,21 +26,33 @@
#include "core.h"
static int sh_pfc_ioremap(struct sh_pfc *pfc)
static int sh_pfc_ioremap(struct sh_pfc *pfc, struct platform_device *pdev)
{
unsigned int num_resources;
struct resource *res;
int k;
if (!pfc->pdata->num_resources)
return 0;
if (pdev->num_resources) {
num_resources = pdev->num_resources;
res = pdev->resource;
} else {
num_resources = pfc->pdata->num_resources;
res = pfc->pdata->resource;
}
pfc->window = devm_kzalloc(pfc->dev, pfc->pdata->num_resources *
if (num_resources == 0) {
pfc->num_windows = 0;
return 0;
}
pfc->window = devm_kzalloc(pfc->dev, num_resources *
sizeof(*pfc->window), GFP_NOWAIT);
if (!pfc->window)
return -ENOMEM;
for (k = 0; k < pfc->pdata->num_resources; k++) {
res = pfc->pdata->resource + k;
pfc->num_windows = num_resources;
for (k = 0; k < num_resources; k++, res++) {
WARN_ON(resource_type(res) != IORESOURCE_MEM);
pfc->window[k].phys = res->start;
pfc->window[k].size = resource_size(res);
@ -60,7 +72,7 @@ static void __iomem *sh_pfc_phys_to_virt(struct sh_pfc *pfc,
int k;
/* scan through physical windows and convert address */
for (k = 0; k < pfc->pdata->num_resources; k++) {
for (k = 0; k < pfc->num_windows; k++) {
window = pfc->window + k;
if (address < window->phys)
@ -498,7 +510,7 @@ static int sh_pfc_probe(struct platform_device *pdev)
pfc->pdata = pdata;
pfc->dev = &pdev->dev;
ret = sh_pfc_ioremap(pfc);
ret = sh_pfc_ioremap(pfc, pdev);
if (unlikely(ret < 0))
return ret;

2
drivers/sh/pfc/core.h
View file

@ -28,7 +28,9 @@ struct sh_pfc {
struct sh_pfc_platform_data *pdata;
spinlock_t lock;
unsigned int num_windows;
struct sh_pfc_window *window;
struct sh_pfc_chip *gpio;
struct sh_pfc_pinctrl *pinctrl;
};