From: Anders Roxell <anders.roxell@linaro.org> To: soc@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, robh@kernel.org, linus.walleij@linaro.org, Anders Roxell <anders.roxell@linaro.org> Subject: [PATCH 5/5] power: vexpress: make the reset driver a module Date: Wed, 27 May 2020 13:26:08 +0200 [thread overview] Message-ID: <20200527112608.3886105-6-anders.roxell@linaro.org> (raw) In-Reply-To: <20200527112608.3886105-1-anders.roxell@linaro.org> Today the vexpress power driver can only be builtin. Rework so it's possible for the vexpress power driver to be a module. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- arch/arm/mach-vexpress/Kconfig | 1 - drivers/power/reset/Kconfig | 5 +++-- drivers/power/reset/vexpress-poweroff.c | 12 +++++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 065e12991663..4b54d8cf897d 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -15,7 +15,6 @@ menuconfig ARCH_VEXPRESS select NO_IOPORT_MAP select PLAT_VERSATILE select POWER_RESET - select POWER_RESET_VEXPRESS select POWER_SUPPLY select REGULATOR if MMC_ARMMMCI select REGULATOR_FIXED_VOLTAGE if REGULATOR diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index f07b982c8dff..8468d42b0198 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -189,9 +189,10 @@ config POWER_RESET_VERSATILE reference boards. config POWER_RESET_VEXPRESS - bool "ARM Versatile Express power-off and reset driver" + tristate "ARM Versatile Express power-off and reset driver" depends on ARM || ARM64 - depends on VEXPRESS_CONFIG=y + depends on VEXPRESS_CONFIG + default VEXPRESS_CONFIG help Power off and reset support for the ARM Ltd. Versatile Express boards. diff --git a/drivers/power/reset/vexpress-poweroff.c b/drivers/power/reset/vexpress-poweroff.c index 1fdbcbd95fc2..b1eef95132d9 100644 --- a/drivers/power/reset/vexpress-poweroff.c +++ b/drivers/power/reset/vexpress-poweroff.c @@ -5,6 +5,7 @@ */ #include <linux/delay.h> +#include <linux/module.h> #include <linux/notifier.h> #include <linux/of.h> #include <linux/of_device.h> @@ -146,4 +147,13 @@ static struct platform_driver vexpress_reset_driver = { .suppress_bind_attrs = true, }, }; -builtin_platform_driver(vexpress_reset_driver); + +static int __init vexpress_reset_init(void) +{ + return platform_driver_register(&vexpress_reset_driver); +} +module_init(vexpress_reset_init); + +MODULE_AUTHOR("Pawel Moll <pawel.moll@arm.com>"); +MODULE_DESCRIPTION("Vexpress reset driver"); +MODULE_LICENSE("GPL v2"); -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Anders Roxell <anders.roxell@linaro.org> To: soc@kernel.org Cc: robh@kernel.org, linus.walleij@linaro.org, Anders Roxell <anders.roxell@linaro.org>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/5] power: vexpress: make the reset driver a module Date: Wed, 27 May 2020 13:26:08 +0200 [thread overview] Message-ID: <20200527112608.3886105-6-anders.roxell@linaro.org> (raw) In-Reply-To: <20200527112608.3886105-1-anders.roxell@linaro.org> Today the vexpress power driver can only be builtin. Rework so it's possible for the vexpress power driver to be a module. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- arch/arm/mach-vexpress/Kconfig | 1 - drivers/power/reset/Kconfig | 5 +++-- drivers/power/reset/vexpress-poweroff.c | 12 +++++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 065e12991663..4b54d8cf897d 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -15,7 +15,6 @@ menuconfig ARCH_VEXPRESS select NO_IOPORT_MAP select PLAT_VERSATILE select POWER_RESET - select POWER_RESET_VEXPRESS select POWER_SUPPLY select REGULATOR if MMC_ARMMMCI select REGULATOR_FIXED_VOLTAGE if REGULATOR diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index f07b982c8dff..8468d42b0198 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -189,9 +189,10 @@ config POWER_RESET_VERSATILE reference boards. config POWER_RESET_VEXPRESS - bool "ARM Versatile Express power-off and reset driver" + tristate "ARM Versatile Express power-off and reset driver" depends on ARM || ARM64 - depends on VEXPRESS_CONFIG=y + depends on VEXPRESS_CONFIG + default VEXPRESS_CONFIG help Power off and reset support for the ARM Ltd. Versatile Express boards. diff --git a/drivers/power/reset/vexpress-poweroff.c b/drivers/power/reset/vexpress-poweroff.c index 1fdbcbd95fc2..b1eef95132d9 100644 --- a/drivers/power/reset/vexpress-poweroff.c +++ b/drivers/power/reset/vexpress-poweroff.c @@ -5,6 +5,7 @@ */ #include <linux/delay.h> +#include <linux/module.h> #include <linux/notifier.h> #include <linux/of.h> #include <linux/of_device.h> @@ -146,4 +147,13 @@ static struct platform_driver vexpress_reset_driver = { .suppress_bind_attrs = true, }, }; -builtin_platform_driver(vexpress_reset_driver); + +static int __init vexpress_reset_init(void) +{ + return platform_driver_register(&vexpress_reset_driver); +} +module_init(vexpress_reset_init); + +MODULE_AUTHOR("Pawel Moll <pawel.moll@arm.com>"); +MODULE_DESCRIPTION("Vexpress reset driver"); +MODULE_LICENSE("GPL v2"); -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-05-27 11:26 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-27 11:26 [PATCH 0/5] vexpress: modularize power reset driver Anders Roxell 2020-05-27 11:26 ` Anders Roxell 2020-05-27 11:26 ` [PATCH 1/5] power: vexpress: add suppress_bind_attrs to true Anders Roxell 2020-05-27 11:26 ` Anders Roxell 2020-05-27 13:26 ` Rob Herring 2020-05-28 10:25 ` Arnd Bergmann 2020-05-28 10:25 ` Arnd Bergmann 2020-05-27 11:26 ` [PATCH 2/5] power: vexpress: cleanup: use builtin_platform_driver Anders Roxell 2020-05-27 11:26 ` Anders Roxell 2020-05-27 11:26 ` [PATCH 3/5] Revert "ARM: vexpress: Don't select VEXPRESS_CONFIG" Anders Roxell 2020-05-27 11:26 ` Anders Roxell 2020-05-27 11:26 ` [PATCH 4/5] power: reset: vexpress: fix build issue Anders Roxell 2020-05-27 11:26 ` Anders Roxell 2020-05-27 11:26 ` Anders Roxell [this message] 2020-05-27 11:26 ` [PATCH 5/5] power: vexpress: make the reset driver a module Anders Roxell 2020-05-27 13:32 ` Rob Herring 2020-05-28 10:28 ` Arnd Bergmann 2020-05-28 10:28 ` Arnd Bergmann 2020-05-27 13:34 ` [PATCH 0/5] vexpress: modularize power reset driver Rob Herring 2020-05-28 10:34 ` Arnd Bergmann 2020-05-28 10:34 ` Arnd Bergmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200527112608.3886105-6-anders.roxell@linaro.org \ --to=anders.roxell@linaro.org \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=robh@kernel.org \ --cc=soc@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.