| Message ID | 1434530336-15073-6-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
On 17 June 2015 at 10:38, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > Add support for easy registering of one ore more platform devices that > may: > - need clocks that are described in DT, > - be part of a PM Domain. > > All these dependencies are optional. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > v2: > - Drop support for pinctrl, use standard pinctrl in DT instead, > - Drop support for configured GPIOs, use "gpio-hog" in DT instead, > - Use clk_add_alias() instead of open coding, > - Update for changed function names, > - Drop RFC status. > --- > drivers/staging/board/board.c | 56 +++++++++++++++++++++++++++++++++++++++++++ > drivers/staging/board/board.h | 20 ++++++++++++++++ > 2 files changed, 76 insertions(+) > > diff --git a/drivers/staging/board/board.c b/drivers/staging/board/board.c > index 8712f566b31196e0..29d456e29f38feac 100644 > --- a/drivers/staging/board/board.c > +++ b/drivers/staging/board/board.c > @@ -9,6 +9,7 @@ > > #define pr_fmt(fmt) "board_staging: " fmt > > +#include <linux/clkdev.h> > #include <linux/init.h> > #include <linux/irq.h> > #include <linux/device.h> > @@ -16,6 +17,8 @@ > #include <linux/of.h> > #include <linux/of_address.h> > #include <linux/of_irq.h> > +#include <linux/platform_device.h> > +#include <linux/pm_domain.h> > > #include "board.h" > > @@ -118,3 +121,56 @@ void __init board_staging_gic_fixup_resources(struct resource *res, > for (i = 0; i < nres; i++) > gic_fixup_resource(&res[i]); > } > + > +int __init board_staging_register_clock(const struct board_staging_clk *bsc) > +{ > + int error; > + > + pr_debug("Aliasing clock %s for con_id %s dev_id %s\n", bsc->clk, > + bsc->con_id, bsc->dev_id); > + error = clk_add_alias(bsc->con_id, bsc->dev_id, bsc->clk, NULL); > + if (error) > + pr_err("Failed to alias clock %s (%d)\n", bsc->clk, error); > + > + return error; > +} > + > +int __init board_staging_register_device(const struct board_staging_dev *dev) > +{ > + struct platform_device *pdev = dev->pdev; > + unsigned int i; > + int error; > + > + pr_debug("Trying to register device %s\n", pdev->name); > + if (board_staging_dt_node_available(pdev->resource, > + pdev->num_resources)) { > + pr_warn("Skipping %s, already in DT\n", pdev->name); > + return -EEXIST; > + } > + > + board_staging_gic_fixup_resources(pdev->resource, pdev->num_resources); > + > + for (i = 0; i < dev->nclocks; i++) > + board_staging_register_clock(&dev->clocks[i]); > + > + error = platform_device_register(pdev); > + if (error) { > + pr_err("Failed to register device %s (%d)\n", pdev->name, > + error); > + return error; > + } > + > + if (dev->domain) > + __pm_genpd_name_add_device(dev->domain, &pdev->dev, NULL); Urgh, this managed to slip through my filters. It seems like we almost managed to remove all users of the "..._name_add..." APIs for genpd. If hasn't been for $subject patch. :-) Now, I realize this is already too late here, but let's try to fix this before it turns into a bigger issue. Geert, do you think it's possible to convert into using the non-named bases APIs? Kind regards Uffe -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Ulf, On Thu, Sep 3, 2015 at 2:53 PM, Ulf Hansson <ulf.hansson@linaro.org> wrote: > On 17 June 2015 at 10:38, Geert Uytterhoeven <geert+renesas@glider.be> wrote: >> Add support for easy registering of one ore more platform devices that >> may: >> - need clocks that are described in DT, >> - be part of a PM Domain. >> diff --git a/drivers/staging/board/board.c b/drivers/staging/board/board.c >> index 8712f566b31196e0..29d456e29f38feac 100644 >> --- a/drivers/staging/board/board.c >> +++ b/drivers/staging/board/board.c >> +int __init board_staging_register_device(const struct board_staging_dev *dev) >> +{ >> + struct platform_device *pdev = dev->pdev; >> + unsigned int i; >> + int error; >> + >> + pr_debug("Trying to register device %s\n", pdev->name); >> + if (board_staging_dt_node_available(pdev->resource, >> + pdev->num_resources)) { >> + pr_warn("Skipping %s, already in DT\n", pdev->name); >> + return -EEXIST; >> + } >> + >> + board_staging_gic_fixup_resources(pdev->resource, pdev->num_resources); >> + >> + for (i = 0; i < dev->nclocks; i++) >> + board_staging_register_clock(&dev->clocks[i]); >> + >> + error = platform_device_register(pdev); >> + if (error) { >> + pr_err("Failed to register device %s (%d)\n", pdev->name, >> + error); >> + return error; >> + } >> + >> + if (dev->domain) >> + __pm_genpd_name_add_device(dev->domain, &pdev->dev, NULL); > > Urgh, this managed to slip through my filters. > > It seems like we almost managed to remove all users of the > "..._name_add..." APIs for genpd. If hasn't been for $subject patch. > :-) > > Now, I realize this is already too late here, but let's try to fix > this before it turns into a bigger issue. > > Geert, do you think it's possible to convert into using the non-named > bases APIs? That will be difficult. This code is meant to use drivers that are not yet DT-aware on DT-based systems. Hence it uses platform devices with named PM domains, while the PM domains are described in DT. I don't think there's another way to look up a PM domain by name, is there? This code is meant to go away, once all drivers are converted to DT, or considered obsolete. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 3 September 2015 at 15:35, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > Hi Ulf, > > On Thu, Sep 3, 2015 at 2:53 PM, Ulf Hansson <ulf.hansson@linaro.org> wrote: >> On 17 June 2015 at 10:38, Geert Uytterhoeven <geert+renesas@glider.be> wrote: >>> Add support for easy registering of one ore more platform devices that >>> may: >>> - need clocks that are described in DT, >>> - be part of a PM Domain. > >>> diff --git a/drivers/staging/board/board.c b/drivers/staging/board/board.c >>> index 8712f566b31196e0..29d456e29f38feac 100644 >>> --- a/drivers/staging/board/board.c >>> +++ b/drivers/staging/board/board.c > >>> +int __init board_staging_register_device(const struct board_staging_dev *dev) >>> +{ >>> + struct platform_device *pdev = dev->pdev; >>> + unsigned int i; >>> + int error; >>> + >>> + pr_debug("Trying to register device %s\n", pdev->name); >>> + if (board_staging_dt_node_available(pdev->resource, >>> + pdev->num_resources)) { >>> + pr_warn("Skipping %s, already in DT\n", pdev->name); >>> + return -EEXIST; >>> + } >>> + >>> + board_staging_gic_fixup_resources(pdev->resource, pdev->num_resources); >>> + >>> + for (i = 0; i < dev->nclocks; i++) >>> + board_staging_register_clock(&dev->clocks[i]); >>> + >>> + error = platform_device_register(pdev); >>> + if (error) { >>> + pr_err("Failed to register device %s (%d)\n", pdev->name, >>> + error); >>> + return error; >>> + } >>> + >>> + if (dev->domain) >>> + __pm_genpd_name_add_device(dev->domain, &pdev->dev, NULL); >> >> Urgh, this managed to slip through my filters. >> >> It seems like we almost managed to remove all users of the >> "..._name_add..." APIs for genpd. If hasn't been for $subject patch. >> :-) >> >> Now, I realize this is already too late here, but let's try to fix >> this before it turns into a bigger issue. >> >> Geert, do you think it's possible to convert into using the non-named >> bases APIs? > > That will be difficult. This code is meant to use drivers that are not yet > DT-aware on DT-based systems. Hence it uses platform devices with named PM > domains, while the PM domains are described in DT. > I don't think there's another way to look up a PM domain by name, is there? As a matter of fact there are, especially for those genpds that has been created through DT as in this case. The API to use is of_genpd_get_from_provider() to find the struct generic_pm_domain. Yes, I do realize that you need to manage the parsing of the domain name to make sure it's the one you want, but I would rather keep that "hack" in this driver than in the generic API. > > This code is meant to go away, once all drivers are converted to DT, or > considered obsolete. Well, who knows *when* that is going to happen. :-) Kind regards Uffe -- To unsubscribe from this list: send the line "unsubscribe linux-sh" 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/staging/board/board.c b/drivers/staging/board/board.c index 8712f566b31196e0..29d456e29f38feac 100644 --- a/drivers/staging/board/board.c +++ b/drivers/staging/board/board.c @@ -9,6 +9,7 @@ #define pr_fmt(fmt) "board_staging: " fmt +#include <linux/clkdev.h> #include <linux/init.h> #include <linux/irq.h> #include <linux/device.h> @@ -16,6 +17,8 @@ #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> +#include <linux/platform_device.h> +#include <linux/pm_domain.h> #include "board.h" @@ -118,3 +121,56 @@ void __init board_staging_gic_fixup_resources(struct resource *res, for (i = 0; i < nres; i++) gic_fixup_resource(&res[i]); } + +int __init board_staging_register_clock(const struct board_staging_clk *bsc) +{ + int error; + + pr_debug("Aliasing clock %s for con_id %s dev_id %s\n", bsc->clk, + bsc->con_id, bsc->dev_id); + error = clk_add_alias(bsc->con_id, bsc->dev_id, bsc->clk, NULL); + if (error) + pr_err("Failed to alias clock %s (%d)\n", bsc->clk, error); + + return error; +} + +int __init board_staging_register_device(const struct board_staging_dev *dev) +{ + struct platform_device *pdev = dev->pdev; + unsigned int i; + int error; + + pr_debug("Trying to register device %s\n", pdev->name); + if (board_staging_dt_node_available(pdev->resource, + pdev->num_resources)) { + pr_warn("Skipping %s, already in DT\n", pdev->name); + return -EEXIST; + } + + board_staging_gic_fixup_resources(pdev->resource, pdev->num_resources); + + for (i = 0; i < dev->nclocks; i++) + board_staging_register_clock(&dev->clocks[i]); + + error = platform_device_register(pdev); + if (error) { + pr_err("Failed to register device %s (%d)\n", pdev->name, + error); + return error; + } + + if (dev->domain) + __pm_genpd_name_add_device(dev->domain, &pdev->dev, NULL); + + return error; +} + +void __init board_staging_register_devices(const struct board_staging_dev *devs, + unsigned int ndevs) +{ + unsigned int i; + + for (i = 0; i < ndevs; i++) + board_staging_register_device(&devs[i]); +} diff --git a/drivers/staging/board/board.h b/drivers/staging/board/board.h index 3af6dbe22f91ebdc..42ed125132201327 100644 --- a/drivers/staging/board/board.h +++ b/drivers/staging/board/board.h @@ -4,12 +4,32 @@ #include <linux/init.h> #include <linux/of.h> +struct board_staging_clk { + const char *clk; + const char *con_id; + const char *dev_id; +}; + +struct board_staging_dev { + /* Platform Device */ + struct platform_device *pdev; + /* Clocks (optional) */ + const struct board_staging_clk *clocks; + unsigned int nclocks; + /* Generic PM Domain (optional) */ + const char *domain; +}; + struct resource; bool board_staging_dt_node_available(const struct resource *resource, unsigned int num_resources); int board_staging_gic_setup_xlate(const char *gic_match, unsigned int base); void board_staging_gic_fixup_resources(struct resource *res, unsigned int nres); +int board_staging_register_clock(const struct board_staging_clk *bsc); +int board_staging_register_device(const struct board_staging_dev *dev); +void board_staging_register_devices(const struct board_staging_dev *devs, + unsigned int ndevs); #define board_staging(str, fn) \ static int __init runtime_board_check(void) \
Add support for easy registering of one ore more platform devices that may: - need clocks that are described in DT, - be part of a PM Domain. All these dependencies are optional. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v2: - Drop support for pinctrl, use standard pinctrl in DT instead, - Drop support for configured GPIOs, use "gpio-hog" in DT instead, - Use clk_add_alias() instead of open coding, - Update for changed function names, - Drop RFC status. --- drivers/staging/board/board.c | 56 +++++++++++++++++++++++++++++++++++++++++++ drivers/staging/board/board.h | 20 ++++++++++++++++ 2 files changed, 76 insertions(+)