firmware: arm_scmi: Move power-domain driver to the pmdomain dir

[PATCH] firmware: arm_scmi: Move power-domain driver to the pmdomain dir

Posted by Sudeep Holla 2 years, 4 months ago

To simplify with maintenance let's move the Arm SCMI power-domain driver
to the new pmdomain directory.

Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Cristian Marussi <cristian.marussi@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---

Hi Ulf,

If you are happy with this, please cck. I would like to take this along
with your scmi_perf_domain change as part of you series.

Regards,
Sudeep

 drivers/firmware/arm_scmi/Makefile                           | 1 -
 drivers/pmdomain/arm/Makefile                                | 1 +
 drivers/{firmware/arm_scmi => pmdomain/arm}/scmi_pm_domain.c | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename drivers/{firmware/arm_scmi => pmdomain/arm}/scmi_pm_domain.c (100%)

diff --git a/drivers/firmware/arm_scmi/Makefile b/drivers/firmware/arm_scmi/Makefile
index b31d78fa66cc..a7bc4796519c 100644
--- a/drivers/firmware/arm_scmi/Makefile
+++ b/drivers/firmware/arm_scmi/Makefile
@@ -16,7 +16,6 @@ scmi-module-objs := $(scmi-driver-y) $(scmi-protocols-y) $(scmi-transport-y)
 obj-$(CONFIG_ARM_SCMI_PROTOCOL) += scmi-core.o
 obj-$(CONFIG_ARM_SCMI_PROTOCOL) += scmi-module.o
 
-obj-$(CONFIG_ARM_SCMI_POWER_DOMAIN) += scmi_pm_domain.o
 obj-$(CONFIG_ARM_SCMI_POWER_CONTROL) += scmi_power_control.o
 
 ifeq ($(CONFIG_THUMB2_KERNEL)$(CONFIG_CC_IS_CLANG),yy)
diff --git a/drivers/pmdomain/arm/Makefile b/drivers/pmdomain/arm/Makefile
index 7128db96deac..cfcb1f6cdd90 100644
--- a/drivers/pmdomain/arm/Makefile
+++ b/drivers/pmdomain/arm/Makefile
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 obj-$(CONFIG_ARM_SCMI_PERF_DOMAIN) += scmi_perf_domain.o
+obj-$(CONFIG_ARM_SCMI_POWER_DOMAIN) += scmi_pm_domain.o
diff --git a/drivers/firmware/arm_scmi/scmi_pm_domain.c b/drivers/pmdomain/arm/scmi_pm_domain.c
similarity index 100%
rename from drivers/firmware/arm_scmi/scmi_pm_domain.c
rename to drivers/pmdomain/arm/scmi_pm_domain.c
-- 
2.42.0

Re: [PATCH] firmware: arm_scmi: Move power-domain driver to the pmdomain dir

Posted by Sudeep Holla 2 years, 4 months ago

On Thu, Sep 21, 2023 at 12:33:28PM +0100, Sudeep Holla wrote:
> To simplify with maintenance let's move the Arm SCMI power-domain driver
> to the new pmdomain directory.
> 
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Cristian Marussi <cristian.marussi@arm.com>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
> 
> Hi Ulf,
> 
> If you are happy with this, please cck. I would like to take this along
> with your scmi_perf_domain change as part of you series.
> 
> Regards,
> Sudeep
> 
>  drivers/firmware/arm_scmi/Makefile                           | 1 -
>  drivers/pmdomain/arm/Makefile                                | 1 +
>  drivers/{firmware/arm_scmi => pmdomain/arm}/scmi_pm_domain.c | 0
>  3 files changed, 1 insertion(+), 1 deletion(-)
>  rename drivers/{firmware/arm_scmi => pmdomain/arm}/scmi_pm_domain.c (100%)
>

Applied to sudeep.holla/linux (for-next/scmi/updates), thanks!

[1/1] firmware: arm_scmi: firmware: arm_scmi: Move power-domain driver to thepmdomain dir
      https://git.kernel.org/sudeep.holla/c/af78e5c309c4

-- 
Regards,
Sudeep

Re: [PATCH] firmware: arm_scmi: Move power-domain driver to the pmdomain dir

Posted by Ulf Hansson 2 years, 4 months ago

On Thu, 21 Sept 2023 at 13:33, Sudeep Holla <sudeep.holla@arm.com> wrote:
>
> To simplify with maintenance let's move the Arm SCMI power-domain driver
> to the new pmdomain directory.
>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Cristian Marussi <cristian.marussi@arm.com>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>

Feel free to take it through your scmi tree!

Note that, we should move the Kconfig options too, but that requires
changes that I am carrying in my pmdomain tree. We can either wait
until the next cycle or you could send your pull-request to me this
time (instead of through arm-soc), then we can fix this as a late
minute change. The decision is yours.

Kind regards
Uffe

> ---
>
> Hi Ulf,
>
> If you are happy with this, please cck. I would like to take this along
> with your scmi_perf_domain change as part of you series.
>
> Regards,
> Sudeep
>
>  drivers/firmware/arm_scmi/Makefile                           | 1 -
>  drivers/pmdomain/arm/Makefile                                | 1 +
>  drivers/{firmware/arm_scmi => pmdomain/arm}/scmi_pm_domain.c | 0
>  3 files changed, 1 insertion(+), 1 deletion(-)
>  rename drivers/{firmware/arm_scmi => pmdomain/arm}/scmi_pm_domain.c (100%)
>
> diff --git a/drivers/firmware/arm_scmi/Makefile b/drivers/firmware/arm_scmi/Makefile
> index b31d78fa66cc..a7bc4796519c 100644
> --- a/drivers/firmware/arm_scmi/Makefile
> +++ b/drivers/firmware/arm_scmi/Makefile
> @@ -16,7 +16,6 @@ scmi-module-objs := $(scmi-driver-y) $(scmi-protocols-y) $(scmi-transport-y)
>  obj-$(CONFIG_ARM_SCMI_PROTOCOL) += scmi-core.o
>  obj-$(CONFIG_ARM_SCMI_PROTOCOL) += scmi-module.o
>
> -obj-$(CONFIG_ARM_SCMI_POWER_DOMAIN) += scmi_pm_domain.o
>  obj-$(CONFIG_ARM_SCMI_POWER_CONTROL) += scmi_power_control.o
>
>  ifeq ($(CONFIG_THUMB2_KERNEL)$(CONFIG_CC_IS_CLANG),yy)
> diff --git a/drivers/pmdomain/arm/Makefile b/drivers/pmdomain/arm/Makefile
> index 7128db96deac..cfcb1f6cdd90 100644
> --- a/drivers/pmdomain/arm/Makefile
> +++ b/drivers/pmdomain/arm/Makefile
> @@ -1,3 +1,4 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>
>  obj-$(CONFIG_ARM_SCMI_PERF_DOMAIN) += scmi_perf_domain.o
> +obj-$(CONFIG_ARM_SCMI_POWER_DOMAIN) += scmi_pm_domain.o
> diff --git a/drivers/firmware/arm_scmi/scmi_pm_domain.c b/drivers/pmdomain/arm/scmi_pm_domain.c
> similarity index 100%
> rename from drivers/firmware/arm_scmi/scmi_pm_domain.c
> rename to drivers/pmdomain/arm/scmi_pm_domain.c
> --
> 2.42.0
>

Re: [PATCH] firmware: arm_scmi: Move power-domain driver to the pmdomain dir

Posted by Sudeep Holla 2 years, 4 months ago

On Thu, Sep 21, 2023 at 03:10:56PM +0200, Ulf Hansson wrote:
> On Thu, 21 Sept 2023 at 13:33, Sudeep Holla <sudeep.holla@arm.com> wrote:
> >
> > To simplify with maintenance let's move the Arm SCMI power-domain driver
> > to the new pmdomain directory.
> >
> > Cc: Ulf Hansson <ulf.hansson@linaro.org>
> > Cc: Cristian Marussi <cristian.marussi@arm.com>
> > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> 
> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> 
> Feel free to take it through your scmi tree!
> 
> Note that, we should move the Kconfig options too, but that requires
> changes that I am carrying in my pmdomain tree. We can either wait
> until the next cycle or you could send your pull-request to me this
> time (instead of through arm-soc), then we can fix this as a late
> minute change. The decision is yours.
> 

OK. Lets us just delay SCMI Kconfig changes for the next cycle then. I assume
you would have other changes merged by then. Or may be as a fix as it would
be hardlt 10-15 line with 2 Kconfig options. Let me know if you disagree or
have other ideas.

-- 
Regards,
Sudeep

Re: [PATCH] firmware: arm_scmi: Move power-domain driver to the pmdomain dir

Posted by Ulf Hansson 2 years, 4 months ago

On Thu, 21 Sept 2023 at 15:33, Sudeep Holla <sudeep.holla@arm.com> wrote:
>
> On Thu, Sep 21, 2023 at 03:10:56PM +0200, Ulf Hansson wrote:
> > On Thu, 21 Sept 2023 at 13:33, Sudeep Holla <sudeep.holla@arm.com> wrote:
> > >
> > > To simplify with maintenance let's move the Arm SCMI power-domain driver
> > > to the new pmdomain directory.
> > >
> > > Cc: Ulf Hansson <ulf.hansson@linaro.org>
> > > Cc: Cristian Marussi <cristian.marussi@arm.com>
> > > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> >
> > Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> >
> > Feel free to take it through your scmi tree!
> >
> > Note that, we should move the Kconfig options too, but that requires
> > changes that I am carrying in my pmdomain tree. We can either wait
> > until the next cycle or you could send your pull-request to me this
> > time (instead of through arm-soc), then we can fix this as a late
> > minute change. The decision is yours.
> >
>
> OK. Lets us just delay SCMI Kconfig changes for the next cycle then. I assume
> you would have other changes merged by then. Or may be as a fix as it would
> be hardlt 10-15 line with 2 Kconfig options. Let me know if you disagree or
> have other ideas.

Let's delay, it's probably easier. Maybe a fix for rc1 would be best.

Kind regards
Uffe