It seems reasonable to collect the core parts for the generic PM domain,
along with its corresponding provider drivers. Therefore let's move the
files from drivers/base/power/ to drivers/pmdomain/ and while at it, let's
also rename the files accordingly.
Moreover, let's also update MAINTAINERS to reflect the update.
Cc: Kevin Hilman <[email protected]>
Signed-off-by: Ulf Hansson <[email protected]>
---
MAINTAINERS | 10 +---------
drivers/base/power/Makefile | 1 -
drivers/pmdomain/Makefile | 1 +
drivers/{base/power/domain.c => pmdomain/core.c} | 0
.../power/domain_governor.c => pmdomain/governor.c} | 0
5 files changed, 2 insertions(+), 10 deletions(-)
rename drivers/{base/power/domain.c => pmdomain/core.c} (100%)
rename drivers/{base/power/domain_governor.c => pmdomain/governor.c} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index ea790149af79..ab4b0aed34f9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8878,21 +8878,13 @@ F: Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.yaml
F: drivers/i2c/muxes/i2c-demux-pinctrl.c
GENERIC PM DOMAINS
-M: "Rafael J. Wysocki" <[email protected]>
-M: Kevin Hilman <[email protected]>
M: Ulf Hansson <[email protected]>
L: [email protected]
S: Supported
F: Documentation/devicetree/bindings/power/power?domain*
-F: drivers/base/power/domain*.c
-F: include/linux/pm_domain.h
-
-GENERIC PM DOMAIN PROVIDERS
-M: Ulf Hansson <[email protected]>
-L: [email protected]
-S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
F: drivers/pmdomain/
+F: include/linux/pm_domain.h
GENERIC RADIX TREE
M: Kent Overstreet <[email protected]>
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
index 8fdd0073eeeb..01f11629d241 100644
--- a/drivers/base/power/Makefile
+++ b/drivers/base/power/Makefile
@@ -2,7 +2,6 @@
obj-$(CONFIG_PM) += sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o
obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o wakeup_stats.o
obj-$(CONFIG_PM_TRACE_RTC) += trace.o
-obj-$(CONFIG_PM_GENERIC_DOMAINS) += domain.o domain_governor.o
obj-$(CONFIG_HAVE_CLK) += clock_ops.o
obj-$(CONFIG_PM_QOS_KUNIT_TEST) += qos-test.o
diff --git a/drivers/pmdomain/Makefile b/drivers/pmdomain/Makefile
index f0326b27b30b..a68ece2f4c68 100644
--- a/drivers/pmdomain/Makefile
+++ b/drivers/pmdomain/Makefile
@@ -16,3 +16,4 @@ obj-y += sunxi/
obj-y += tegra/
obj-y += ti/
obj-y += xilinx/
+obj-y += core.o governor.o
diff --git a/drivers/base/power/domain.c b/drivers/pmdomain/core.c
similarity index 100%
rename from drivers/base/power/domain.c
rename to drivers/pmdomain/core.c
diff --git a/drivers/base/power/domain_governor.c b/drivers/pmdomain/governor.c
similarity index 100%
rename from drivers/base/power/domain_governor.c
rename to drivers/pmdomain/governor.c
--
2.34.1
On Wed, Dec 13, 2023 at 12:33 PM Ulf Hansson <[email protected]> wrote:
>
> It seems reasonable to collect the core parts for the generic PM domain,
> along with its corresponding provider drivers. Therefore let's move the
> files from drivers/base/power/ to drivers/pmdomain/ and while at it, let's
> also rename the files accordingly.
>
> Moreover, let's also update MAINTAINERS to reflect the update.
>
> Cc: Kevin Hilman <[email protected]>
> Signed-off-by: Ulf Hansson <[email protected]>
Acked-by: Rafael J. Wysocki <[email protected]>
for both patches in the series.
Thanks!
> ---
> MAINTAINERS | 10 +---------
> drivers/base/power/Makefile | 1 -
> drivers/pmdomain/Makefile | 1 +
> drivers/{base/power/domain.c => pmdomain/core.c} | 0
> .../power/domain_governor.c => pmdomain/governor.c} | 0
> 5 files changed, 2 insertions(+), 10 deletions(-)
> rename drivers/{base/power/domain.c => pmdomain/core.c} (100%)
> rename drivers/{base/power/domain_governor.c => pmdomain/governor.c} (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ea790149af79..ab4b0aed34f9 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -8878,21 +8878,13 @@ F: Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.yaml
> F: drivers/i2c/muxes/i2c-demux-pinctrl.c
>
> GENERIC PM DOMAINS
> -M: "Rafael J. Wysocki" <[email protected]>
> -M: Kevin Hilman <[email protected]>
> M: Ulf Hansson <[email protected]>
> L: [email protected]
> S: Supported
> F: Documentation/devicetree/bindings/power/power?domain*
> -F: drivers/base/power/domain*.c
> -F: include/linux/pm_domain.h
> -
> -GENERIC PM DOMAIN PROVIDERS
> -M: Ulf Hansson <[email protected]>
> -L: [email protected]
> -S: Supported
> T: git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
> F: drivers/pmdomain/
> +F: include/linux/pm_domain.h
>
> GENERIC RADIX TREE
> M: Kent Overstreet <[email protected]>
> diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
> index 8fdd0073eeeb..01f11629d241 100644
> --- a/drivers/base/power/Makefile
> +++ b/drivers/base/power/Makefile
> @@ -2,7 +2,6 @@
> obj-$(CONFIG_PM) += sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o
> obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o wakeup_stats.o
> obj-$(CONFIG_PM_TRACE_RTC) += trace.o
> -obj-$(CONFIG_PM_GENERIC_DOMAINS) += domain.o domain_governor.o
> obj-$(CONFIG_HAVE_CLK) += clock_ops.o
> obj-$(CONFIG_PM_QOS_KUNIT_TEST) += qos-test.o
>
> diff --git a/drivers/pmdomain/Makefile b/drivers/pmdomain/Makefile
> index f0326b27b30b..a68ece2f4c68 100644
> --- a/drivers/pmdomain/Makefile
> +++ b/drivers/pmdomain/Makefile
> @@ -16,3 +16,4 @@ obj-y += sunxi/
> obj-y += tegra/
> obj-y += ti/
> obj-y += xilinx/
> +obj-y += core.o governor.o
> diff --git a/drivers/base/power/domain.c b/drivers/pmdomain/core.c
> similarity index 100%
> rename from drivers/base/power/domain.c
> rename to drivers/pmdomain/core.c
> diff --git a/drivers/base/power/domain_governor.c b/drivers/pmdomain/governor.c
> similarity index 100%
> rename from drivers/base/power/domain_governor.c
> rename to drivers/pmdomain/governor.c
> --
> 2.34.1
>
Ulf Hansson <[email protected]> writes:
> It seems reasonable to collect the core parts for the generic PM domain,
> along with its corresponding provider drivers. Therefore let's move the
> files from drivers/base/power/ to drivers/pmdomain/ and while at it, let's
> also rename the files accordingly.
>
> Moreover, let's also update MAINTAINERS to reflect the update.
Acked-by: Kevin Hilman <[email protected]>
Kevin