[PATCH 03/17] pmdomain: amlogic: Move Kconfig options to the pmdomain subsystem

[Neil Armstrong]

On 14/09/2023 13:17, Ulf Hansson wrote:
> The Kconfig options belongs closer to the corresponding implementations,
> hence let's move them from the soc subsystem to the pmdomain subsystem.
> 
> Cc: Neil Armstrong <neil.armstrong at linaro.org>
> Cc: Kevin Hilman <khilman at baylibre.com>
> Cc: Jerome Brunet <jbrunet at baylibre.com>
> Cc: Martin Blumenstingl <martin.blumenstingl at googlemail.com>
> Cc: <linux-amlogic at lists.infradead.org>
> Signed-off-by: Ulf Hansson <ulf.hansson at linaro.org>
> ---
>   drivers/pmdomain/Kconfig         |  1 +
>   drivers/pmdomain/amlogic/Kconfig | 39 ++++++++++++++++++++++++++++++++
>   drivers/soc/amlogic/Kconfig      | 35 ----------------------------
>   3 files changed, 40 insertions(+), 35 deletions(-)
>   create mode 100644 drivers/pmdomain/amlogic/Kconfig
> 
> diff --git a/drivers/pmdomain/Kconfig b/drivers/pmdomain/Kconfig
> index 8acb10bcdec9..07d2f8165abe 100644
> --- a/drivers/pmdomain/Kconfig
> +++ b/drivers/pmdomain/Kconfig
> @@ -2,5 +2,6 @@
>   menu "Power Domains Support"
>   
>   source "drivers/pmdomain/actions/Kconfig"
> +source "drivers/pmdomain/amlogic/Kconfig"
>   
>   endmenu
> diff --git a/drivers/pmdomain/amlogic/Kconfig b/drivers/pmdomain/amlogic/Kconfig
> new file mode 100644
> index 000000000000..ee1affffbce6
> --- /dev/null
> +++ b/drivers/pmdomain/amlogic/Kconfig
> @@ -0,0 +1,39 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +menu "Amlogic Power Domains"
> +
> +config MESON_GX_PM_DOMAINS
> +	tristate "Amlogic Meson GX Power Domains driver"
> +	depends on ARCH_MESON || COMPILE_TEST
> +	depends on PM && OF
> +	default ARCH_MESON
> +	select PM_GENERIC_DOMAINS
> +	select PM_GENERIC_DOMAINS_OF
> +	help
> +	  Say yes to expose Amlogic Meson GX Power Domains as
> +	  Generic Power Domains.
> +
> +config MESON_EE_PM_DOMAINS
> +	tristate "Amlogic Meson Everything-Else Power Domains driver"
> +	depends on ARCH_MESON || COMPILE_TEST
> +	depends on PM && OF
> +	default ARCH_MESON
> +	select PM_GENERIC_DOMAINS
> +	select PM_GENERIC_DOMAINS_OF
> +	help
> +	  Say yes to expose Amlogic Meson Everything-Else Power Domains as
> +	  Generic Power Domains.
> +
> +config MESON_SECURE_PM_DOMAINS
> +	tristate "Amlogic Meson Secure Power Domains driver"
> +	depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM
> +	depends on PM && OF
> +	depends on HAVE_ARM_SMCCC
> +	default ARCH_MESON
> +	select PM_GENERIC_DOMAINS
> +	select PM_GENERIC_DOMAINS_OF
> +	help
> +	  Support for the power controller on Amlogic A1/C1 series.
> +	  Say yes to expose Amlogic Meson Secure Power Domains as Generic
> +	  Power Domains.
> +
> +endmenu
> diff --git a/drivers/soc/amlogic/Kconfig b/drivers/soc/amlogic/Kconfig
> index 174a9b011461..d08e398bdad4 100644
> --- a/drivers/soc/amlogic/Kconfig
> +++ b/drivers/soc/amlogic/Kconfig
> @@ -26,41 +26,6 @@ config MESON_GX_SOCINFO
>   	  Say yes to support decoding of Amlogic Meson GX SoC family
>   	  information about the type, package and version.
>   
> -config MESON_GX_PM_DOMAINS
> -	tristate "Amlogic Meson GX Power Domains driver"
> -	depends on ARCH_MESON || COMPILE_TEST
> -	depends on PM && OF
> -	default ARCH_MESON
> -	select PM_GENERIC_DOMAINS
> -	select PM_GENERIC_DOMAINS_OF
> -	help
> -	  Say yes to expose Amlogic Meson GX Power Domains as
> -	  Generic Power Domains.
> -
> -config MESON_EE_PM_DOMAINS
> -	tristate "Amlogic Meson Everything-Else Power Domains driver"
> -	depends on ARCH_MESON || COMPILE_TEST
> -	depends on PM && OF
> -	default ARCH_MESON
> -	select PM_GENERIC_DOMAINS
> -	select PM_GENERIC_DOMAINS_OF
> -	help
> -	  Say yes to expose Amlogic Meson Everything-Else Power Domains as
> -	  Generic Power Domains.
> -
> -config MESON_SECURE_PM_DOMAINS
> -	tristate "Amlogic Meson Secure Power Domains driver"
> -	depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM
> -	depends on PM && OF
> -	depends on HAVE_ARM_SMCCC
> -	default ARCH_MESON
> -	select PM_GENERIC_DOMAINS
> -	select PM_GENERIC_DOMAINS_OF
> -	help
> -	  Support for the power controller on Amlogic A1/C1 series.
> -	  Say yes to expose Amlogic Meson Secure Power Domains as Generic
> -	  Power Domains.
> -
>   config MESON_MX_SOCINFO
>   	bool "Amlogic Meson MX SoC Information driver"
>   	depends on (ARM && ARCH_MESON) || COMPILE_TEST

Acked-by: Neil Armstrong <neil.armstrong at linaro.org>