| Message ID | 20170816094701.30678-4-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Philipp, On Wed, 2017-08-16 at 11:46 +0200, Philipp Zabel wrote: > The reset-simple driver can be used without changes. > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > [snip] > > --- a/drivers/reset/reset-simple.c > +++ b/drivers/reset/reset-simple.c > @@ -120,6 +120,7 @@ static const struct reset_simple_devdata > reset_simple_active_low = { > > static const struct of_device_id reset_simple_dt_ids[] = { > { .compatible = "altr,rst-mgr", .data = > &reset_simple_socfpga }, > + { .compatible = "st,stm32-rcc", }, > { .compatible = "allwinner,sun6i-a31-clock-reset", > .data = &reset_simple_active_low }, > { /* sentinel */ }, What about adding generic compatible strings for future use? I mean next: --------------------->8--------------------- static const struct of_device_id reset_simple_dt_ids[] = { { .compatible = "reset-simple-active-low", .data = &reset_simple_active_low }, { .compatible = "reset-simple-active-high", .data = &reset_simple_active_high }, /* ... */ { /* sentinel */ }, }; static const struct reset_simple_devdata reset_simple_active_high = { .active_low = false, }; static const struct reset_simple_devdata reset_simple_active_low = { .active_low = true, }; --------------------->8--------------------- -- Eugeniy Paltsev
Hi Eugeniy, Am 16.08.2017 um 14:52 schrieb Eugeniy Paltsev: > On Wed, 2017-08-16 at 11:46 +0200, Philipp Zabel wrote: >> The reset-simple driver can be used without changes. >> >> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> >> [snip] >> >> --- a/drivers/reset/reset-simple.c >> +++ b/drivers/reset/reset-simple.c >> @@ -120,6 +120,7 @@ static const struct reset_simple_devdata >> reset_simple_active_low = { >> >> static const struct of_device_id reset_simple_dt_ids[] = { >> { .compatible = "altr,rst-mgr", .data = >> &reset_simple_socfpga }, >> + { .compatible = "st,stm32-rcc", }, >> { .compatible = "allwinner,sun6i-a31-clock-reset", >> .data = &reset_simple_active_low }, >> { /* sentinel */ }, > > What about adding generic compatible strings for future use? Please see 1/5 for the same discussion, raised by Andre and me. Thanks, Andreas
Hi, On 16/08/17 13:52, Eugeniy Paltsev wrote: > Hi Philipp, > > On Wed, 2017-08-16 at 11:46 +0200, Philipp Zabel wrote: >> The reset-simple driver can be used without changes. >> >> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> >> [snip] >> >> --- a/drivers/reset/reset-simple.c >> +++ b/drivers/reset/reset-simple.c >> @@ -120,6 +120,7 @@ static const struct reset_simple_devdata >> reset_simple_active_low = { >> >> static const struct of_device_id reset_simple_dt_ids[] = { >> { .compatible = "altr,rst-mgr", .data = >> &reset_simple_socfpga }, >> + { .compatible = "st,stm32-rcc", }, >> { .compatible = "allwinner,sun6i-a31-clock-reset", >> .data = &reset_simple_active_low }, >> { /* sentinel */ }, > > What about adding generic compatible strings for future use? Exactly ;-) (see my previous email) But we still need the pre-existing strings in here, of course. > I mean next: > > --------------------->8--------------------- > > static const struct of_device_id reset_simple_dt_ids[] = { > { .compatible = "reset-simple-active-low", > .data = &reset_simple_active_low }, > { .compatible = "reset-simple-active-high", > .data = &reset_simple_active_high }, Either that or maybe even better define a "simple-reset" string and add standard properties like "active-low". Cheers, Andre. > /* ... */ > { /* sentinel */ }, > }; > > static const struct reset_simple_devdata reset_simple_active_high = { > .active_low = false, > }; > > static const struct reset_simple_devdata reset_simple_active_low = { > .active_low = true, > }; > > --------------------->8--------------------- >
On 08/16/2017 02:46 AM, Philipp Zabel wrote: > The reset-simple driver can be used without changes. > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Alexandru Gagniuc <alex.g@adaptrum.com> > --- > drivers/reset/Kconfig | 11 ++--- > drivers/reset/Makefile | 1 - > drivers/reset/reset-simple.c | 1 + > drivers/reset/reset-stm32.c | 108 ------------------------------------------- > 4 files changed, 4 insertions(+), 117 deletions(-) > delete mode 100644 drivers/reset/reset-stm32.c > > diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig > index 78a8f6057985b..29f4487c290fc 100644 > --- a/drivers/reset/Kconfig > +++ b/drivers/reset/Kconfig > @@ -70,19 +70,14 @@ config RESET_PISTACHIO > > config RESET_SIMPLE > bool "Simple Reset Controller Driver" if COMPILE_TEST > - default ARCH_SOCFPGA || ARCH_SUNXI > + default ARCH_SOCFPGA || ARCH_STM32 || ARCH_SUNXI If this series gets respun, could you please look into removing the ARCH_ dependency here? Alex > help > This enables a simple reset controller driver for reset lines that > that can be asserted and deasserted by toggling bits in a contiguous, > exclusive register space. > > - Currently this driver supports Altera SoCFPGAs and Allwinner SoCs. > - > -config RESET_STM32 > - bool "STM32 Reset Driver" if COMPILE_TEST > - default ARCH_STM32 > - help > - This enables the RCC reset controller driver for STM32 MCUs. > + Currently this driver supports Altera SoCFPGAs, the RCC reset > + controller in STM32 MCUs, and Allwinner SoCs. > > config RESET_SUNXI > bool "Allwinner SoCs Reset Driver" if COMPILE_TEST && !ARCH_SUNXI > diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile > index 25f5f722dec01..e8c3a032f4780 100644 > --- a/drivers/reset/Makefile > +++ b/drivers/reset/Makefile > @@ -12,7 +12,6 @@ obj-$(CONFIG_RESET_MESON) += reset-meson.o > obj-$(CONFIG_RESET_OXNAS) += reset-oxnas.o > obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o > obj-$(CONFIG_RESET_SIMPLE) += reset-simple.o > -obj-$(CONFIG_RESET_STM32) += reset-stm32.o > obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o > obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o > obj-$(CONFIG_RESET_TI_SYSCON) += reset-ti-syscon.o > diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c > index 84b08ce4def01..e54a29b8b532d 100644 > --- a/drivers/reset/reset-simple.c > +++ b/drivers/reset/reset-simple.c > @@ -120,6 +120,7 @@ static const struct reset_simple_devdata reset_simple_active_low = { > > static const struct of_device_id reset_simple_dt_ids[] = { > { .compatible = "altr,rst-mgr", .data = &reset_simple_socfpga }, > + { .compatible = "st,stm32-rcc", }, > { .compatible = "allwinner,sun6i-a31-clock-reset", > .data = &reset_simple_active_low }, > { /* sentinel */ }, > diff --git a/drivers/reset/reset-stm32.c b/drivers/reset/reset-stm32.c > deleted file mode 100644 > index 3a7c8527e66af..0000000000000 > --- a/drivers/reset/reset-stm32.c > +++ /dev/null > @@ -1,108 +0,0 @@ > -/* > - * Copyright (C) Maxime Coquelin 2015 > - * Author: Maxime Coquelin <mcoquelin.stm32@gmail.com> > - * License terms: GNU General Public License (GPL), version 2 > - * > - * Heavily based on sunxi driver from Maxime Ripard. > - */ > - > -#include <linux/err.h> > -#include <linux/io.h> > -#include <linux/of.h> > -#include <linux/of_address.h> > -#include <linux/platform_device.h> > -#include <linux/reset-controller.h> > -#include <linux/slab.h> > -#include <linux/spinlock.h> > -#include <linux/types.h> > - > -struct stm32_reset_data { > - spinlock_t lock; > - void __iomem *membase; > - struct reset_controller_dev rcdev; > -}; > - > -static int stm32_reset_assert(struct reset_controller_dev *rcdev, > - unsigned long id) > -{ > - struct stm32_reset_data *data = container_of(rcdev, > - struct stm32_reset_data, > - rcdev); > - int bank = id / BITS_PER_LONG; > - int offset = id % BITS_PER_LONG; > - unsigned long flags; > - u32 reg; > - > - spin_lock_irqsave(&data->lock, flags); > - > - reg = readl(data->membase + (bank * 4)); > - writel(reg | BIT(offset), data->membase + (bank * 4)); > - > - spin_unlock_irqrestore(&data->lock, flags); > - > - return 0; > -} > - > -static int stm32_reset_deassert(struct reset_controller_dev *rcdev, > - unsigned long id) > -{ > - struct stm32_reset_data *data = container_of(rcdev, > - struct stm32_reset_data, > - rcdev); > - int bank = id / BITS_PER_LONG; > - int offset = id % BITS_PER_LONG; > - unsigned long flags; > - u32 reg; > - > - spin_lock_irqsave(&data->lock, flags); > - > - reg = readl(data->membase + (bank * 4)); > - writel(reg & ~BIT(offset), data->membase + (bank * 4)); > - > - spin_unlock_irqrestore(&data->lock, flags); > - > - return 0; > -} > - > -static const struct reset_control_ops stm32_reset_ops = { > - .assert = stm32_reset_assert, > - .deassert = stm32_reset_deassert, > -}; > - > -static const struct of_device_id stm32_reset_dt_ids[] = { > - { .compatible = "st,stm32-rcc", }, > - { /* sentinel */ }, > -}; > - > -static int stm32_reset_probe(struct platform_device *pdev) > -{ > - struct stm32_reset_data *data; > - struct resource *res; > - > - data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); > - if (!data) > - return -ENOMEM; > - > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - data->membase = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR(data->membase)) > - return PTR_ERR(data->membase); > - > - spin_lock_init(&data->lock); > - > - data->rcdev.owner = THIS_MODULE; > - data->rcdev.nr_resets = resource_size(res) * 8; > - data->rcdev.ops = &stm32_reset_ops; > - data->rcdev.of_node = pdev->dev.of_node; > - > - return devm_reset_controller_register(&pdev->dev, &data->rcdev); > -} > - > -static struct platform_driver stm32_reset_driver = { > - .probe = stm32_reset_probe, > - .driver = { > - .name = "stm32-rcc-reset", > - .of_match_table = stm32_reset_dt_ids, > - }, > -}; > -builtin_platform_driver(stm32_reset_driver); >
Am 16.08.2017 um 22:50 schrieb Alexandru Gagniuc: > On 08/16/2017 02:46 AM, Philipp Zabel wrote: >> The reset-simple driver can be used without changes. >> >> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > > Reviewed-by: Alexandru Gagniuc <alex.g@adaptrum.com> > >> --- >> drivers/reset/Kconfig | 11 ++--- >> drivers/reset/Makefile | 1 - >> drivers/reset/reset-simple.c | 1 + >> drivers/reset/reset-stm32.c | 108 >> ------------------------------------------- >> 4 files changed, 4 insertions(+), 117 deletions(-) >> delete mode 100644 drivers/reset/reset-stm32.c >> >> diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig >> index 78a8f6057985b..29f4487c290fc 100644 >> --- a/drivers/reset/Kconfig >> +++ b/drivers/reset/Kconfig >> @@ -70,19 +70,14 @@ config RESET_PISTACHIO >> >> config RESET_SIMPLE >> bool "Simple Reset Controller Driver" if COMPILE_TEST >> - default ARCH_SOCFPGA || ARCH_SUNXI >> + default ARCH_SOCFPGA || ARCH_STM32 || ARCH_SUNXI > > If this series gets respun, could you please look into removing the > ARCH_ dependency here? Why? It's not a dependency, just the default. Doing it here decouples it from having to do Kconfig changes in the arm-soc tree as well. Regards, Andreas
On 08/16/2017 01:52 PM, Andreas Färber wrote: > Am 16.08.2017 um 22:50 schrieb Alexandru Gagniuc: >> On 08/16/2017 02:46 AM, Philipp Zabel wrote: >>> The reset-simple driver can be used without changes. >>> >>> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> >> >> Reviewed-by: Alexandru Gagniuc <alex.g@adaptrum.com> >> >>> --- >>> drivers/reset/Kconfig | 11 ++--- >>> drivers/reset/Makefile | 1 - >>> drivers/reset/reset-simple.c | 1 + >>> drivers/reset/reset-stm32.c | 108 >>> ------------------------------------------- >>> 4 files changed, 4 insertions(+), 117 deletions(-) >>> delete mode 100644 drivers/reset/reset-stm32.c >>> >>> diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig >>> index 78a8f6057985b..29f4487c290fc 100644 >>> --- a/drivers/reset/Kconfig >>> +++ b/drivers/reset/Kconfig >>> @@ -70,19 +70,14 @@ config RESET_PISTACHIO >>> >>> config RESET_SIMPLE >>> bool "Simple Reset Controller Driver" if COMPILE_TEST >>> - default ARCH_SOCFPGA || ARCH_SUNXI >>> + default ARCH_SOCFPGA || ARCH_STM32 || ARCH_SUNXI >> >> If this series gets respun, could you please look into removing the >> ARCH_ dependency here? > > Why? Because the driver has to keep track of all its users, which is a layering violation. > It's not a dependency, just the default. Doing it here decouples it > from having to do Kconfig changes in the arm-soc tree as well. Doing it here allows this list to grow without bounds. > Regards, > Andreas >
Hi, On 16/08/17 21:55, Alexandru Gagniuc wrote: > > > On 08/16/2017 01:52 PM, Andreas Färber wrote: >> Am 16.08.2017 um 22:50 schrieb Alexandru Gagniuc: >>> On 08/16/2017 02:46 AM, Philipp Zabel wrote: >>>> The reset-simple driver can be used without changes. >>>> >>>> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> >>> >>> Reviewed-by: Alexandru Gagniuc <alex.g@adaptrum.com> >>> >>>> --- >>>> drivers/reset/Kconfig | 11 ++--- >>>> drivers/reset/Makefile | 1 - >>>> drivers/reset/reset-simple.c | 1 + >>>> drivers/reset/reset-stm32.c | 108 >>>> ------------------------------------------- >>>> 4 files changed, 4 insertions(+), 117 deletions(-) >>>> delete mode 100644 drivers/reset/reset-stm32.c >>>> >>>> diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig >>>> index 78a8f6057985b..29f4487c290fc 100644 >>>> --- a/drivers/reset/Kconfig >>>> +++ b/drivers/reset/Kconfig >>>> @@ -70,19 +70,14 @@ config RESET_PISTACHIO >>>> >>>> config RESET_SIMPLE >>>> bool "Simple Reset Controller Driver" if COMPILE_TEST >>>> - default ARCH_SOCFPGA || ARCH_SUNXI >>>> + default ARCH_SOCFPGA || ARCH_STM32 || ARCH_SUNXI >>> >>> If this series gets respun, could you please look into removing the >>> ARCH_ dependency here? >> >> Why? > > Because the driver has to keep track of all its users, which is a > layering violation. "keep track of all its users": not necessarily, this is mostly for convenience reasons to get automatic coverage for those SoCs without changing various defconfigs - or distribution .configs, for that matter. Especially the latter may prove to be nasty and introduce regressions. But I see that this list may grow big and this is a bit beyond the scope of the otherwise neat "default ARCH_xxx" trick. So given the generic nature of this driver, can't we make this simply: "default ARM || ARM64" That would enable it everywhere automatically, but people can still disable this if they know what they do. Alternatively for ARM64 this is actually a candidate for the (one and only) defconfig. Cheers, Andre. >> It's not a dependency, just the default. Doing it here decouples it >> from having to do Kconfig changes in the arm-soc tree as well. > > Doing it here allows this list to grow without bounds. > >> Regards, >> Andreas >>
On Thu, 2017-08-17 at 10:19 +0100, Andre Przywara wrote: > Hi, > > On 16/08/17 21:55, Alexandru Gagniuc wrote: > > > > > > On 08/16/2017 01:52 PM, Andreas Färber wrote: > > > Am 16.08.2017 um 22:50 schrieb Alexandru Gagniuc: > > > > On 08/16/2017 02:46 AM, Philipp Zabel wrote: > > > > > The reset-simple driver can be used without changes. > > > > > > > > > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > > > > > > > > > > > > Reviewed-by: Alexandru Gagniuc <alex.g@adaptrum.com> > > > > > > > > > --- > > > > > drivers/reset/Kconfig | 11 ++--- > > > > > drivers/reset/Makefile | 1 - > > > > > drivers/reset/reset-simple.c | 1 + > > > > > drivers/reset/reset-stm32.c | 108 > > > > > ------------------------------------------- > > > > > 4 files changed, 4 insertions(+), 117 deletions(-) > > > > > delete mode 100644 drivers/reset/reset-stm32.c > > > > > > > > > > diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig > > > > > index 78a8f6057985b..29f4487c290fc 100644 > > > > > --- a/drivers/reset/Kconfig > > > > > +++ b/drivers/reset/Kconfig > > > > > @@ -70,19 +70,14 @@ config RESET_PISTACHIO > > > > > > > > > > config RESET_SIMPLE > > > > > bool "Simple Reset Controller Driver" if COMPILE_TEST > > > > > - default ARCH_SOCFPGA || ARCH_SUNXI > > > > > + default ARCH_SOCFPGA || ARCH_STM32 || ARCH_SUNXI > > > > > > > > If this series gets respun, could you please look into removing the > > > > ARCH_ dependency here? > > > > > > Why? > > > > Because the driver has to keep track of all its users, which is a > > layering violation. > > "keep track of all its users": not necessarily, this is mostly for > convenience reasons to get automatic coverage for those SoCs without > changing various defconfigs - or distribution .configs, for that matter. > Especially the latter may prove to be nasty and introduce regressions. > > But I see that this list may grow big and this is a bit beyond the scope > of the otherwise neat "default ARCH_xxx" trick. > > So given the generic nature of this driver, can't we make this simply: > "default ARM || ARM64" > That would enable it everywhere automatically, but people can still > disable this if they know what they do. > > Alternatively for ARM64 this is actually a candidate for the (one and > only) defconfig. I would like to make this driver selectable. but for that to happen, ARCH_HAS_RESET_CONTROLLER and RESET_CONTROLLER have to be merged into a single selectable symbol first. Until then, I'd be fine with making this driver: bool "Simple Reset Controller Driver" default ARM || ARM64 but in my opinion it is equally ok to have the default ARCH_* list for a while. regards Philipp
On 08/16/2017 11:46 AM, Philipp Zabel wrote: > The reset-simple driver can be used without changes. > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > Reviewed-by: Alexandru Gagniuc <alex.g@adaptrum.com> > --- > drivers/reset/Kconfig | 11 ++--- > drivers/reset/Makefile | 1 - > drivers/reset/reset-simple.c | 1 + > drivers/reset/reset-stm32.c | 108 ------------------------------------------- > 4 files changed, 4 insertions(+), 117 deletions(-) > delete mode 100644 drivers/reset/reset-stm32.c > > diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig > index 78a8f6057985b..29f4487c290fc 100644 > --- a/drivers/reset/Kconfig > +++ b/drivers/reset/Kconfig > @@ -70,19 +70,14 @@ config RESET_PISTACHIO > > config RESET_SIMPLE > bool "Simple Reset Controller Driver" if COMPILE_TEST > - default ARCH_SOCFPGA || ARCH_SUNXI > + default ARCH_SOCFPGA || ARCH_STM32 || ARCH_SUNXI > help > This enables a simple reset controller driver for reset lines that > that can be asserted and deasserted by toggling bits in a contiguous, > exclusive register space. > > - Currently this driver supports Altera SoCFPGAs and Allwinner SoCs. > - > -config RESET_STM32 > - bool "STM32 Reset Driver" if COMPILE_TEST > - default ARCH_STM32 > - help > - This enables the RCC reset controller driver for STM32 MCUs. > + Currently this driver supports Altera SoCFPGAs, the RCC reset > + controller in STM32 MCUs, and Allwinner SoCs. > > config RESET_SUNXI > bool "Allwinner SoCs Reset Driver" if COMPILE_TEST && !ARCH_SUNXI > diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile > index 25f5f722dec01..e8c3a032f4780 100644 > --- a/drivers/reset/Makefile > +++ b/drivers/reset/Makefile > @@ -12,7 +12,6 @@ obj-$(CONFIG_RESET_MESON) += reset-meson.o > obj-$(CONFIG_RESET_OXNAS) += reset-oxnas.o > obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o > obj-$(CONFIG_RESET_SIMPLE) += reset-simple.o > -obj-$(CONFIG_RESET_STM32) += reset-stm32.o > obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o > obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o > obj-$(CONFIG_RESET_TI_SYSCON) += reset-ti-syscon.o > diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c > index 84b08ce4def01..e54a29b8b532d 100644 > --- a/drivers/reset/reset-simple.c > +++ b/drivers/reset/reset-simple.c > @@ -120,6 +120,7 @@ static const struct reset_simple_devdata reset_simple_active_low = { > > static const struct of_device_id reset_simple_dt_ids[] = { > { .compatible = "altr,rst-mgr", .data = &reset_simple_socfpga }, > + { .compatible = "st,stm32-rcc", }, > { .compatible = "allwinner,sun6i-a31-clock-reset", > .data = &reset_simple_active_low }, > { /* sentinel */ }, > diff --git a/drivers/reset/reset-stm32.c b/drivers/reset/reset-stm32.c > deleted file mode 100644 > index 3a7c8527e66af..0000000000000 > --- a/drivers/reset/reset-stm32.c > +++ /dev/null > @@ -1,108 +0,0 @@ > -/* > - * Copyright (C) Maxime Coquelin 2015 > - * Author: Maxime Coquelin <mcoquelin.stm32@gmail.com> > - * License terms: GNU General Public License (GPL), version 2 > - * > - * Heavily based on sunxi driver from Maxime Ripard. > - */ > - > -#include <linux/err.h> > -#include <linux/io.h> > -#include <linux/of.h> > -#include <linux/of_address.h> > -#include <linux/platform_device.h> > -#include <linux/reset-controller.h> > -#include <linux/slab.h> > -#include <linux/spinlock.h> > -#include <linux/types.h> > - > -struct stm32_reset_data { > - spinlock_t lock; > - void __iomem *membase; > - struct reset_controller_dev rcdev; > -}; > - > -static int stm32_reset_assert(struct reset_controller_dev *rcdev, > - unsigned long id) > -{ > - struct stm32_reset_data *data = container_of(rcdev, > - struct stm32_reset_data, > - rcdev); > - int bank = id / BITS_PER_LONG; > - int offset = id % BITS_PER_LONG; > - unsigned long flags; > - u32 reg; > - > - spin_lock_irqsave(&data->lock, flags); > - > - reg = readl(data->membase + (bank * 4)); > - writel(reg | BIT(offset), data->membase + (bank * 4)); > - > - spin_unlock_irqrestore(&data->lock, flags); > - > - return 0; > -} > - > -static int stm32_reset_deassert(struct reset_controller_dev *rcdev, > - unsigned long id) > -{ > - struct stm32_reset_data *data = container_of(rcdev, > - struct stm32_reset_data, > - rcdev); > - int bank = id / BITS_PER_LONG; > - int offset = id % BITS_PER_LONG; > - unsigned long flags; > - u32 reg; > - > - spin_lock_irqsave(&data->lock, flags); > - > - reg = readl(data->membase + (bank * 4)); > - writel(reg & ~BIT(offset), data->membase + (bank * 4)); > - > - spin_unlock_irqrestore(&data->lock, flags); > - > - return 0; > -} > - > -static const struct reset_control_ops stm32_reset_ops = { > - .assert = stm32_reset_assert, > - .deassert = stm32_reset_deassert, > -}; > - > -static const struct of_device_id stm32_reset_dt_ids[] = { > - { .compatible = "st,stm32-rcc", }, > - { /* sentinel */ }, > -}; > - > -static int stm32_reset_probe(struct platform_device *pdev) > -{ > - struct stm32_reset_data *data; > - struct resource *res; > - > - data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); > - if (!data) > - return -ENOMEM; > - > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - data->membase = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR(data->membase)) > - return PTR_ERR(data->membase); > - > - spin_lock_init(&data->lock); > - > - data->rcdev.owner = THIS_MODULE; > - data->rcdev.nr_resets = resource_size(res) * 8; > - data->rcdev.ops = &stm32_reset_ops; > - data->rcdev.of_node = pdev->dev.of_node; > - > - return devm_reset_controller_register(&pdev->dev, &data->rcdev); > -} > - > -static struct platform_driver stm32_reset_driver = { > - .probe = stm32_reset_probe, > - .driver = { > - .name = "stm32-rcc-reset", > - .of_match_table = stm32_reset_dt_ids, > - }, > -}; > -builtin_platform_driver(stm32_reset_driver); Acked-by: Gabriel Fernandez <gabriel.fernandez@st.com>
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 78a8f6057985b..29f4487c290fc 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -70,19 +70,14 @@ config RESET_PISTACHIO config RESET_SIMPLE bool "Simple Reset Controller Driver" if COMPILE_TEST - default ARCH_SOCFPGA || ARCH_SUNXI + default ARCH_SOCFPGA || ARCH_STM32 || ARCH_SUNXI help This enables a simple reset controller driver for reset lines that that can be asserted and deasserted by toggling bits in a contiguous, exclusive register space. - Currently this driver supports Altera SoCFPGAs and Allwinner SoCs. - -config RESET_STM32 - bool "STM32 Reset Driver" if COMPILE_TEST - default ARCH_STM32 - help - This enables the RCC reset controller driver for STM32 MCUs. + Currently this driver supports Altera SoCFPGAs, the RCC reset + controller in STM32 MCUs, and Allwinner SoCs. config RESET_SUNXI bool "Allwinner SoCs Reset Driver" if COMPILE_TEST && !ARCH_SUNXI diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index 25f5f722dec01..e8c3a032f4780 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@ -12,7 +12,6 @@ obj-$(CONFIG_RESET_MESON) += reset-meson.o obj-$(CONFIG_RESET_OXNAS) += reset-oxnas.o obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o obj-$(CONFIG_RESET_SIMPLE) += reset-simple.o -obj-$(CONFIG_RESET_STM32) += reset-stm32.o obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o obj-$(CONFIG_RESET_TI_SYSCON) += reset-ti-syscon.o diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c index 84b08ce4def01..e54a29b8b532d 100644 --- a/drivers/reset/reset-simple.c +++ b/drivers/reset/reset-simple.c @@ -120,6 +120,7 @@ static const struct reset_simple_devdata reset_simple_active_low = { static const struct of_device_id reset_simple_dt_ids[] = { { .compatible = "altr,rst-mgr", .data = &reset_simple_socfpga }, + { .compatible = "st,stm32-rcc", }, { .compatible = "allwinner,sun6i-a31-clock-reset", .data = &reset_simple_active_low }, { /* sentinel */ }, diff --git a/drivers/reset/reset-stm32.c b/drivers/reset/reset-stm32.c deleted file mode 100644 index 3a7c8527e66af..0000000000000 --- a/drivers/reset/reset-stm32.c +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) Maxime Coquelin 2015 - * Author: Maxime Coquelin <mcoquelin.stm32@gmail.com> - * License terms: GNU General Public License (GPL), version 2 - * - * Heavily based on sunxi driver from Maxime Ripard. - */ - -#include <linux/err.h> -#include <linux/io.h> -#include <linux/of.h> -#include <linux/of_address.h> -#include <linux/platform_device.h> -#include <linux/reset-controller.h> -#include <linux/slab.h> -#include <linux/spinlock.h> -#include <linux/types.h> - -struct stm32_reset_data { - spinlock_t lock; - void __iomem *membase; - struct reset_controller_dev rcdev; -}; - -static int stm32_reset_assert(struct reset_controller_dev *rcdev, - unsigned long id) -{ - struct stm32_reset_data *data = container_of(rcdev, - struct stm32_reset_data, - rcdev); - int bank = id / BITS_PER_LONG; - int offset = id % BITS_PER_LONG; - unsigned long flags; - u32 reg; - - spin_lock_irqsave(&data->lock, flags); - - reg = readl(data->membase + (bank * 4)); - writel(reg | BIT(offset), data->membase + (bank * 4)); - - spin_unlock_irqrestore(&data->lock, flags); - - return 0; -} - -static int stm32_reset_deassert(struct reset_controller_dev *rcdev, - unsigned long id) -{ - struct stm32_reset_data *data = container_of(rcdev, - struct stm32_reset_data, - rcdev); - int bank = id / BITS_PER_LONG; - int offset = id % BITS_PER_LONG; - unsigned long flags; - u32 reg; - - spin_lock_irqsave(&data->lock, flags); - - reg = readl(data->membase + (bank * 4)); - writel(reg & ~BIT(offset), data->membase + (bank * 4)); - - spin_unlock_irqrestore(&data->lock, flags); - - return 0; -} - -static const struct reset_control_ops stm32_reset_ops = { - .assert = stm32_reset_assert, - .deassert = stm32_reset_deassert, -}; - -static const struct of_device_id stm32_reset_dt_ids[] = { - { .compatible = "st,stm32-rcc", }, - { /* sentinel */ }, -}; - -static int stm32_reset_probe(struct platform_device *pdev) -{ - struct stm32_reset_data *data; - struct resource *res; - - data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); - if (!data) - return -ENOMEM; - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - data->membase = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(data->membase)) - return PTR_ERR(data->membase); - - spin_lock_init(&data->lock); - - data->rcdev.owner = THIS_MODULE; - data->rcdev.nr_resets = resource_size(res) * 8; - data->rcdev.ops = &stm32_reset_ops; - data->rcdev.of_node = pdev->dev.of_node; - - return devm_reset_controller_register(&pdev->dev, &data->rcdev); -} - -static struct platform_driver stm32_reset_driver = { - .probe = stm32_reset_probe, - .driver = { - .name = "stm32-rcc-reset", - .of_match_table = stm32_reset_dt_ids, - }, -}; -builtin_platform_driver(stm32_reset_driver);
The reset-simple driver can be used without changes. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- drivers/reset/Kconfig | 11 ++--- drivers/reset/Makefile | 1 - drivers/reset/reset-simple.c | 1 + drivers/reset/reset-stm32.c | 108 ------------------------------------------- 4 files changed, 4 insertions(+), 117 deletions(-) delete mode 100644 drivers/reset/reset-stm32.c