| Message ID | 1399633911-7094-4-git-send-email-boris.brezillon@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> The PRCM (Power/Reset/Clock Management) block exposes several subdevices > in different subsystems (clk, reset ...) > > Add basic support for the PRCM unit with clk (AR100, AHB0, and APB0 clks) > and reset controller subdevices. > > Other subdevices might be added later (if needed). > > Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > drivers/mfd/Kconfig | 8 +++ > drivers/mfd/Makefile | 1 + > drivers/mfd/sun6i-prcm.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 143 insertions(+) > create mode 100644 drivers/mfd/sun6i-prcm.c [...] > +/* > + * Copyright (C) 2014 Free Electrons > + * > + * License Terms: GNU General Public License v2 > + * Author: Boris BREZILLON <boris.brezillon@free-electrons.com> > + * > + * Allwinner PRCM (Power/Reset/Clock Management) driver > + * > + */ > + > +#include <linux/mfd/core.h> > +#include <linux/module.h> > +#include <linux/of.h> Ah, now isn't that better? Acked-by: Lee Jones <lee.jones@linaro.org>
On 09/05/2014 15:52, Lee Jones wrote: >> The PRCM (Power/Reset/Clock Management) block exposes several subdevices >> in different subsystems (clk, reset ...) >> >> Add basic support for the PRCM unit with clk (AR100, AHB0, and APB0 clks) >> and reset controller subdevices. >> >> Other subdevices might be added later (if needed). >> >> Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> >> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> >> --- >> drivers/mfd/Kconfig | 8 +++ >> drivers/mfd/Makefile | 1 + >> drivers/mfd/sun6i-prcm.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 143 insertions(+) >> create mode 100644 drivers/mfd/sun6i-prcm.c > [...] > >> +/* >> + * Copyright (C) 2014 Free Electrons >> + * >> + * License Terms: GNU General Public License v2 >> + * Author: Boris BREZILLON <boris.brezillon@free-electrons.com> >> + * >> + * Allwinner PRCM (Power/Reset/Clock Management) driver >> + * >> + */ >> + >> +#include <linux/mfd/core.h> >> +#include <linux/module.h> >> +#include <linux/of.h> > Ah, now isn't that better? Absolutely :-). > Acked-by: Lee Jones <lee.jones@linaro.org> >
Hi Lee, On Fri, May 09, 2014 at 02:52:51PM +0100, Lee Jones wrote: > > The PRCM (Power/Reset/Clock Management) block exposes several subdevices > > in different subsystems (clk, reset ...) > > > > Add basic support for the PRCM unit with clk (AR100, AHB0, and APB0 clks) > > and reset controller subdevices. > > > > Other subdevices might be added later (if needed). > > > > Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> > > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > --- > > drivers/mfd/Kconfig | 8 +++ > > drivers/mfd/Makefile | 1 + > > drivers/mfd/sun6i-prcm.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 143 insertions(+) > > create mode 100644 drivers/mfd/sun6i-prcm.c > > [...] > > > +/* > > + * Copyright (C) 2014 Free Electrons > > + * > > + * License Terms: GNU General Public License v2 > > + * Author: Boris BREZILLON <boris.brezillon@free-electrons.com> > > + * > > + * Allwinner PRCM (Power/Reset/Clock Management) driver > > + * > > + */ > > + > > +#include <linux/mfd/core.h> > > +#include <linux/module.h> > > +#include <linux/of.h> > > Ah, now isn't that better? > > Acked-by: Lee Jones <lee.jones@linaro.org> How do you want to merge this? Do you want me to take it through mach-sunxi tree, or do you want to take it in your tree? Maxime
> > > The PRCM (Power/Reset/Clock Management) block exposes several subdevices > > > in different subsystems (clk, reset ...) > > > > > > Add basic support for the PRCM unit with clk (AR100, AHB0, and APB0 clks) > > > and reset controller subdevices. > > > > > > Other subdevices might be added later (if needed). > > > > > > Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> > > > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > > --- > > > drivers/mfd/Kconfig | 8 +++ > > > drivers/mfd/Makefile | 1 + > > > drivers/mfd/sun6i-prcm.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ > > > 3 files changed, 143 insertions(+) > > > create mode 100644 drivers/mfd/sun6i-prcm.c > > > > [...] > > > > > +/* > > > + * Copyright (C) 2014 Free Electrons > > > + * > > > + * License Terms: GNU General Public License v2 > > > + * Author: Boris BREZILLON <boris.brezillon@free-electrons.com> > > > + * > > > + * Allwinner PRCM (Power/Reset/Clock Management) driver > > > + * > > > + */ > > > + > > > +#include <linux/mfd/core.h> > > > +#include <linux/module.h> > > > +#include <linux/of.h> > > > > Ah, now isn't that better? > > > > Acked-by: Lee Jones <lee.jones@linaro.org> > > How do you want to merge this? Do you want me to take it through > mach-sunxi tree, or do you want to take it in your tree? If Boris can tell me what needs to go in with this patch (or if it can go in on its own), I will create a(n immutable) branch from which you can pull into your tree.
On Mon, May 19, 2014 at 10:21:59AM +0100, Lee Jones wrote: > > > > The PRCM (Power/Reset/Clock Management) block exposes several subdevices > > > > in different subsystems (clk, reset ...) > > > > > > > > Add basic support for the PRCM unit with clk (AR100, AHB0, and APB0 clks) > > > > and reset controller subdevices. > > > > > > > > Other subdevices might be added later (if needed). > > > > > > > > Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> > > > > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > > > --- > > > > drivers/mfd/Kconfig | 8 +++ > > > > drivers/mfd/Makefile | 1 + > > > > drivers/mfd/sun6i-prcm.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ > > > > 3 files changed, 143 insertions(+) > > > > create mode 100644 drivers/mfd/sun6i-prcm.c > > > > > > [...] > > > > > > > +/* > > > > + * Copyright (C) 2014 Free Electrons > > > > + * > > > > + * License Terms: GNU General Public License v2 > > > > + * Author: Boris BREZILLON <boris.brezillon@free-electrons.com> > > > > + * > > > > + * Allwinner PRCM (Power/Reset/Clock Management) driver > > > > + * > > > > + */ > > > > + > > > > +#include <linux/mfd/core.h> > > > > +#include <linux/module.h> > > > > +#include <linux/of.h> > > > > > > Ah, now isn't that better? > > > > > > Acked-by: Lee Jones <lee.jones@linaro.org> > > > > How do you want to merge this? Do you want me to take it through > > mach-sunxi tree, or do you want to take it in your tree? > > If Boris can tell me what needs to go in with this patch (or if it > can go in on its own), I will create a(n immutable) branch from which > you can pull into your tree. We don't have any runtime or compile time dependency on this, so you can merge it through your tree. Unless something change, I don't have to pull anything in my tree. Thanks! Maxime
> > > > > The PRCM (Power/Reset/Clock Management) block exposes several subdevices > > > > > in different subsystems (clk, reset ...) > > > > > > > > > > Add basic support for the PRCM unit with clk (AR100, AHB0, and APB0 clks) > > > > > and reset controller subdevices. > > > > > > > > > > Other subdevices might be added later (if needed). > > > > > > > > > > Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> > > > > > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > > > > --- > > > > > drivers/mfd/Kconfig | 8 +++ > > > > > drivers/mfd/Makefile | 1 + > > > > > drivers/mfd/sun6i-prcm.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ > > > > > 3 files changed, 143 insertions(+) > > > > > create mode 100644 drivers/mfd/sun6i-prcm.c > > > > > > > > [...] > > > > > > > > > +/* > > > > > + * Copyright (C) 2014 Free Electrons > > > > > + * > > > > > + * License Terms: GNU General Public License v2 > > > > > + * Author: Boris BREZILLON <boris.brezillon@free-electrons.com> > > > > > + * > > > > > + * Allwinner PRCM (Power/Reset/Clock Management) driver > > > > > + * > > > > > + */ > > > > > + > > > > > +#include <linux/mfd/core.h> > > > > > +#include <linux/module.h> > > > > > +#include <linux/of.h> > > > > > > > > Ah, now isn't that better? > > > > > > > > Acked-by: Lee Jones <lee.jones@linaro.org> > > > > > > How do you want to merge this? Do you want me to take it through > > > mach-sunxi tree, or do you want to take it in your tree? > > > > If Boris can tell me what needs to go in with this patch (or if it > > can go in on its own), I will create a(n immutable) branch from which > > you can pull into your tree. > > We don't have any runtime or compile time dependency on this, so you > can merge it through your tree. Unless something change, I don't have > to pull anything in my tree. When you say 'this', do you mean this patch, or this set? If I can just apply this patch, that will be ideal?
On Mon, May 19, 2014 at 02:32:53PM +0100, Lee Jones wrote: > > > > > > > The PRCM (Power/Reset/Clock Management) block exposes several subdevices > > > > > > in different subsystems (clk, reset ...) > > > > > > > > > > > > Add basic support for the PRCM unit with clk (AR100, AHB0, and APB0 clks) > > > > > > and reset controller subdevices. > > > > > > > > > > > > Other subdevices might be added later (if needed). > > > > > > > > > > > > Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> > > > > > > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > > > > > --- > > > > > > drivers/mfd/Kconfig | 8 +++ > > > > > > drivers/mfd/Makefile | 1 + > > > > > > drivers/mfd/sun6i-prcm.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ > > > > > > 3 files changed, 143 insertions(+) > > > > > > create mode 100644 drivers/mfd/sun6i-prcm.c > > > > > > > > > > [...] > > > > > > > > > > > +/* > > > > > > + * Copyright (C) 2014 Free Electrons > > > > > > + * > > > > > > + * License Terms: GNU General Public License v2 > > > > > > + * Author: Boris BREZILLON <boris.brezillon@free-electrons.com> > > > > > > + * > > > > > > + * Allwinner PRCM (Power/Reset/Clock Management) driver > > > > > > + * > > > > > > + */ > > > > > > + > > > > > > +#include <linux/mfd/core.h> > > > > > > +#include <linux/module.h> > > > > > > +#include <linux/of.h> > > > > > > > > > > Ah, now isn't that better? > > > > > > > > > > Acked-by: Lee Jones <lee.jones@linaro.org> > > > > > > > > How do you want to merge this? Do you want me to take it through > > > > mach-sunxi tree, or do you want to take it in your tree? > > > > > > If Boris can tell me what needs to go in with this patch (or if it > > > can go in on its own), I will create a(n immutable) branch from which > > > you can pull into your tree. > > > > We don't have any runtime or compile time dependency on this, so you > > can merge it through your tree. Unless something change, I don't have > > to pull anything in my tree. > > When you say 'this', do you mean this patch, or this set? If I can > just apply this patch, that will be ideal? I mean you can apply these two patches: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-May/256537.html http://lists.infradead.org/pipermail/linux-arm-kernel/2014-May/256535.html And it would be ideal :) Maxime
> > When you say 'this', do you mean this patch, or this set? If I can > > just apply this patch, that will be ideal? > > I mean you can apply these two patches: > http://lists.infradead.org/pipermail/linux-arm-kernel/2014-May/256537.html > http://lists.infradead.org/pipermail/linux-arm-kernel/2014-May/256535.html > > And it would be ideal :) Perfect!
> The PRCM (Power/Reset/Clock Management) block exposes several subdevices > in different subsystems (clk, reset ...) > > Add basic support for the PRCM unit with clk (AR100, AHB0, and APB0 clks) > and reset controller subdevices. > > Other subdevices might be added later (if needed). > > Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > drivers/mfd/Kconfig | 8 +++ > drivers/mfd/Makefile | 1 + > drivers/mfd/sun6i-prcm.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 143 insertions(+) > create mode 100644 drivers/mfd/sun6i-prcm.c Applied, thanks.
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 2d347c9..56794fe 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -731,6 +731,14 @@ config MFD_STA2X11 select MFD_CORE select REGMAP_MMIO +config MFD_SUN6I_PRCM + bool "Allwinner A31 PRCM controller" + depends on ARCH_SUNXI + select MFD_CORE + help + Support for the PRCM (Power/Reset/Clock Management) unit available + in A31 SoC. + config MFD_SYSCON bool "System Controller Register R/W Based on Regmap" select REGMAP_MMIO diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 1efecf2..df7823c 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_MFD_STA2X11) += sta2x11-mfd.o obj-$(CONFIG_MFD_STMPE) += stmpe.o obj-$(CONFIG_STMPE_I2C) += stmpe-i2c.o obj-$(CONFIG_STMPE_SPI) += stmpe-spi.o +obj-$(CONFIG_MFD_SUN6I_PRCM) += sun6i-prcm.o obj-$(CONFIG_MFD_TC3589X) += tc3589x.o obj-$(CONFIG_MFD_T7L66XB) += t7l66xb.o tmio_core.o obj-$(CONFIG_MFD_TC6387XB) += tc6387xb.o tmio_core.o diff --git a/drivers/mfd/sun6i-prcm.c b/drivers/mfd/sun6i-prcm.c new file mode 100644 index 0000000..718fc4d --- /dev/null +++ b/drivers/mfd/sun6i-prcm.c @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2014 Free Electrons + * + * License Terms: GNU General Public License v2 + * Author: Boris BREZILLON <boris.brezillon@free-electrons.com> + * + * Allwinner PRCM (Power/Reset/Clock Management) driver + * + */ + +#include <linux/mfd/core.h> +#include <linux/module.h> +#include <linux/of.h> + +struct prcm_data { + int nsubdevs; + const struct mfd_cell *subdevs; +}; + +static const struct resource sun6i_a31_ar100_clk_res[] = { + { + .start = 0x0, + .end = 0x3, + .flags = IORESOURCE_MEM, + }, +}; + +static const struct resource sun6i_a31_apb0_clk_res[] = { + { + .start = 0xc, + .end = 0xf, + .flags = IORESOURCE_MEM, + }, +}; + +static const struct resource sun6i_a31_apb0_gates_clk_res[] = { + { + .start = 0x28, + .end = 0x2b, + .flags = IORESOURCE_MEM, + }, +}; + +static const struct resource sun6i_a31_apb0_rstc_res[] = { + { + .start = 0xb0, + .end = 0xb3, + .flags = IORESOURCE_MEM, + }, +}; + +static const struct mfd_cell sun6i_a31_prcm_subdevs[] = { + { + .name = "sun6i-a31-ar100-clk", + .of_compatible = "allwinner,sun6i-a31-ar100-clk", + .num_resources = ARRAY_SIZE(sun6i_a31_ar100_clk_res), + .resources = sun6i_a31_ar100_clk_res, + }, + { + .name = "sun6i-a31-apb0-clk", + .of_compatible = "allwinner,sun6i-a31-apb0-clk", + .num_resources = ARRAY_SIZE(sun6i_a31_apb0_clk_res), + .resources = sun6i_a31_apb0_clk_res, + }, + { + .name = "sun6i-a31-apb0-gates-clk", + .of_compatible = "allwinner,sun6i-a31-apb0-gates-clk", + .num_resources = ARRAY_SIZE(sun6i_a31_apb0_gates_clk_res), + .resources = sun6i_a31_apb0_gates_clk_res, + }, + { + .name = "sun6i-a31-apb0-clock-reset", + .of_compatible = "allwinner,sun6i-a31-clock-reset", + .num_resources = ARRAY_SIZE(sun6i_a31_apb0_rstc_res), + .resources = sun6i_a31_apb0_rstc_res, + }, +}; + +static const struct prcm_data sun6i_a31_prcm_data = { + .nsubdevs = ARRAY_SIZE(sun6i_a31_prcm_subdevs), + .subdevs = sun6i_a31_prcm_subdevs, +}; + +static const struct of_device_id sun6i_prcm_dt_ids[] = { + { + .compatible = "allwinner,sun6i-a31-prcm", + .data = &sun6i_a31_prcm_data, + }, + { /* sentinel */ }, +}; + +static int sun6i_prcm_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + const struct of_device_id *match; + const struct prcm_data *data; + struct resource *res; + int ret; + + match = of_match_node(sun6i_prcm_dt_ids, np); + if (!match) + return -EINVAL; + + data = match->data; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(&pdev->dev, "no prcm memory region provided\n"); + return -ENOENT; + } + + ret = mfd_add_devices(&pdev->dev, 0, data->subdevs, data->nsubdevs, + res, -1, NULL); + if (ret) { + dev_err(&pdev->dev, "failed to add subdevices\n"); + return ret; + } + + return 0; +} + +static struct platform_driver sun6i_prcm_driver = { + .driver = { + .name = "sun6i-prcm", + .owner = THIS_MODULE, + .of_match_table = sun6i_prcm_dt_ids, + }, + .probe = sun6i_prcm_probe, +}; +module_platform_driver(sun6i_prcm_driver); + +MODULE_AUTHOR("Boris BREZILLON <boris.brezillon@free-electrons.com>"); +MODULE_DESCRIPTION("Allwinner sun6i PRCM driver"); +MODULE_LICENSE("GPL v2");