[PATCH 1/2] pmdomain: arm_scmi: Move Kconfig options to the pmdomain subsystem

[Ulf Hansson]

On Thu, 23 Nov 2023 at 13:08, Sudeep Holla <sudeep.holla at arm.com> wrote:
>
> The Kconfig options belongs closer to the corresponding implementations,
> hence let's move them from the firmware to the pmdomain subsystem.
>
> Signed-off-by: Sudeep Holla <sudeep.holla at arm.com>

Applied for next, thanks!

Kind regards
Uffe



> ---
>  drivers/firmware/arm_scmi/Kconfig | 25 -------------------------
>  drivers/pmdomain/Kconfig          |  1 +
>  drivers/pmdomain/arm/Kconfig      | 25 +++++++++++++++++++++++++
>  3 files changed, 26 insertions(+), 25 deletions(-)
>  create mode 100644 drivers/pmdomain/arm/Kconfig
>
> diff --git a/drivers/firmware/arm_scmi/Kconfig b/drivers/firmware/arm_scmi/Kconfig
> index 706d1264d038..aa5842be19b2 100644
> --- a/drivers/firmware/arm_scmi/Kconfig
> +++ b/drivers/firmware/arm_scmi/Kconfig
> @@ -168,31 +168,6 @@ config ARM_SCMI_TRANSPORT_VIRTIO_ATOMIC_ENABLE
>
>  endif #ARM_SCMI_PROTOCOL
>
> -config ARM_SCMI_POWER_DOMAIN
> -       tristate "SCMI power domain driver"
> -       depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF)
> -       default y
> -       select PM_GENERIC_DOMAINS if PM
> -       help
> -         This enables support for the SCMI power domains which can be
> -         enabled or disabled via the SCP firmware
> -
> -         This driver can also be built as a module.  If so, the module
> -         will be called scmi_pm_domain. Note this may needed early in boot
> -         before rootfs may be available.
> -
> -config ARM_SCMI_PERF_DOMAIN
> -       tristate "SCMI performance domain driver"
> -       depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF)
> -       default y
> -       select PM_GENERIC_DOMAINS if PM
> -       help
> -         This enables support for the SCMI performance domains which can be
> -         enabled or disabled via the SCP firmware.
> -
> -         This driver can also be built as a module. If so, the module will be
> -         called scmi_perf_domain.
> -
>  config ARM_SCMI_POWER_CONTROL
>         tristate "SCMI system power control driver"
>         depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF)
> diff --git a/drivers/pmdomain/Kconfig b/drivers/pmdomain/Kconfig
> index c98c5bf75a14..23c64851a5b0 100644
> --- a/drivers/pmdomain/Kconfig
> +++ b/drivers/pmdomain/Kconfig
> @@ -4,6 +4,7 @@ menu "PM Domains"
>  source "drivers/pmdomain/actions/Kconfig"
>  source "drivers/pmdomain/amlogic/Kconfig"
>  source "drivers/pmdomain/apple/Kconfig"
> +source "drivers/pmdomain/arm/Kconfig"
>  source "drivers/pmdomain/bcm/Kconfig"
>  source "drivers/pmdomain/imx/Kconfig"
>  source "drivers/pmdomain/mediatek/Kconfig"
> diff --git a/drivers/pmdomain/arm/Kconfig b/drivers/pmdomain/arm/Kconfig
> new file mode 100644
> index 000000000000..acbe4331aaf7
> --- /dev/null
> +++ b/drivers/pmdomain/arm/Kconfig
> @@ -0,0 +1,25 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +config ARM_SCMI_PERF_DOMAIN
> +       tristate "SCMI performance domain driver"
> +       depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF)
> +       default y
> +       select PM_GENERIC_DOMAINS if PM
> +       help
> +         This enables support for the SCMI performance domains which can be
> +         enabled or disabled via the SCP firmware.
> +
> +         This driver can also be built as a module. If so, the module will be
> +         called scmi_perf_domain.
> +
> +config ARM_SCMI_POWER_DOMAIN
> +       tristate "SCMI power domain driver"
> +       depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF)
> +       default y
> +       select PM_GENERIC_DOMAINS if PM
> +       help
> +         This enables support for the SCMI power domains which can be
> +         enabled or disabled via the SCP firmware
> +
> +         This driver can also be built as a module. If so, the module
> +         will be called scmi_pm_domain. Note this may needed early in boot
> +         before rootfs may be available.
> --
> 2.42.0
>