sh-pfc: Support passing resources through platform device

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>

diff --git a/drivers/sh/pfc/core.c b/drivers/sh/pfc/core.c
index cd8f09dcea95feea0d2122f599748ff2aeacd5b9..b2e121d927a00727ca4c3434b900b6e5d20a3c0a 100644 (file)
--- a/drivers/sh/pfc/core.c
+++ b/drivers/sh/pfc/core.c
@@ -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)
+       if (pdev->num_resources) {
+               num_resources = pdev->num_resources;
+               res = pdev->resource;
+       } else {
+               num_resources = pfc->pdata->num_resources;
+               res = pfc->pdata->resource;
+       }
+
+       if (num_resources == 0) {
+               pfc->num_windows = 0;
                return 0;
+       }
 
-       pfc->window = devm_kzalloc(pfc->dev, pfc->pdata->num_resources *
+       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;
 

diff --git a/drivers/sh/pfc/core.h b/drivers/sh/pfc/core.h
index d6a40bc592ff8a42aebe6351c470fba80e21ed26..87ae5fd2a2010050e2e38d2a4b546f7e66648210 100644 (file)
--- a/drivers/sh/pfc/core.h
+++ b/drivers/sh/pfc/core.h
@@ -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;
 };