[PATCH 2/2] firmware: arm_scpi: Move power-domain driver to the pmdomain dir
Ulf Hansson
ulf.hansson at linaro.org
Thu Nov 23 08:38:45 PST 2023
On Thu, 23 Nov 2023 at 13:08, Sudeep Holla <sudeep.holla at arm.com> wrote:
>
> To simplify with maintenance let's move the Arm SCPI power-domain driver
> to the new pmdomain directory. Note this is different from and precedes
> the new Arm SCMI protocol.
>
> Signed-off-by: Sudeep Holla <sudeep.holla at arm.com>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/firmware/Kconfig | 9 ---------
> drivers/firmware/Makefile | 1 -
> drivers/pmdomain/arm/Kconfig | 12 ++++++++++++
> drivers/pmdomain/arm/Makefile | 1 +
> drivers/{firmware => pmdomain/arm}/scpi_pm_domain.c | 0
> 5 files changed, 13 insertions(+), 10 deletions(-)
> rename drivers/{firmware => pmdomain/arm}/scpi_pm_domain.c (100%)
>
> diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
> index 4a98a859d44d..afeb050ae1b4 100644
> --- a/drivers/firmware/Kconfig
> +++ b/drivers/firmware/Kconfig
> @@ -28,15 +28,6 @@ config ARM_SCPI_PROTOCOL
> This protocol library provides interface for all the client drivers
> making use of the features offered by the SCP.
>
> -config ARM_SCPI_POWER_DOMAIN
> - tristate "SCPI power domain driver"
> - depends on ARM_SCPI_PROTOCOL || (COMPILE_TEST && OF)
> - default y
> - select PM_GENERIC_DOMAINS if PM
> - help
> - This enables support for the SCPI power domains which can be
> - enabled or disabled via the SCP firmware
> -
> config ARM_SDE_INTERFACE
> bool "ARM Software Delegated Exception Interface (SDEI)"
> depends on ARM64
> diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
> index 5f9dab82e1a0..944833702ebd 100644
> --- a/drivers/firmware/Makefile
> +++ b/drivers/firmware/Makefile
> @@ -3,7 +3,6 @@
> # Makefile for the linux kernel.
> #
> obj-$(CONFIG_ARM_SCPI_PROTOCOL) += arm_scpi.o
> -obj-$(CONFIG_ARM_SCPI_POWER_DOMAIN) += scpi_pm_domain.o
> obj-$(CONFIG_ARM_SDE_INTERFACE) += arm_sdei.o
> obj-$(CONFIG_DMI) += dmi_scan.o
> obj-$(CONFIG_DMI_SYSFS) += dmi-sysfs.o
> diff --git a/drivers/pmdomain/arm/Kconfig b/drivers/pmdomain/arm/Kconfig
> index acbe4331aaf7..efa139c34e08 100644
> --- a/drivers/pmdomain/arm/Kconfig
> +++ b/drivers/pmdomain/arm/Kconfig
> @@ -23,3 +23,15 @@ config ARM_SCMI_POWER_DOMAIN
> 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_SCPI_POWER_DOMAIN
> + tristate "SCPI power domain driver"
> + depends on ARM_SCPI_PROTOCOL || (COMPILE_TEST && OF)
> + default y
> + select PM_GENERIC_DOMAINS if PM
> + help
> + This enables support for the SCPI 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 scpi_pm_domain.
> diff --git a/drivers/pmdomain/arm/Makefile b/drivers/pmdomain/arm/Makefile
> index cfcb1f6cdd90..502fe4d0a83e 100644
> --- a/drivers/pmdomain/arm/Makefile
> +++ b/drivers/pmdomain/arm/Makefile
> @@ -2,3 +2,4 @@
>
> obj-$(CONFIG_ARM_SCMI_PERF_DOMAIN) += scmi_perf_domain.o
> obj-$(CONFIG_ARM_SCMI_POWER_DOMAIN) += scmi_pm_domain.o
> +obj-$(CONFIG_ARM_SCPI_POWER_DOMAIN) += scpi_pm_domain.o
> diff --git a/drivers/firmware/scpi_pm_domain.c b/drivers/pmdomain/arm/scpi_pm_domain.c
> similarity index 100%
> rename from drivers/firmware/scpi_pm_domain.c
> rename to drivers/pmdomain/arm/scpi_pm_domain.c
> --
> 2.42.0
>
More information about the linux-arm-kernel
mailing list