summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2023-12-13 12:33:05 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2023-12-18 12:49:48 +0100
commitd6948c13b663a284574cb9e502dd663e70d910e8 (patch)
tree2569bab3c919278842ab3b3da640a333791e74c5
parentf871e716058988ee1f97263f3247a2cf998f9579 (diff)
PM: domains: Move genpd and its governor to the pmdomain subsystem
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 <khilman@kernel.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Rafael J. Wysocki <rafael@kernel.org> Link: https://lore.kernel.org/r/20231213113305.29098-1-ulf.hansson@linaro.org
-rw-r--r--MAINTAINERS10
-rw-r--r--drivers/base/power/Makefile1
-rw-r--r--drivers/pmdomain/Makefile1
-rw-r--r--drivers/pmdomain/core.c (renamed from drivers/base/power/domain.c)0
-rw-r--r--drivers/pmdomain/governor.c (renamed from drivers/base/power/domain_governor.c)0
5 files changed, 2 insertions, 10 deletions
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" <rafael@kernel.org>
-M: Kevin Hilman <khilman@kernel.org>
M: Ulf Hansson <ulf.hansson@linaro.org>
L: linux-pm@vger.kernel.org
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 <ulf.hansson@linaro.org>
-L: linux-pm@vger.kernel.org
-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 <kent.overstreet@linux.dev>
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
index 9ee1bf2ece10..9ee1bf2ece10 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/pmdomain/core.c
diff --git a/drivers/base/power/domain_governor.c b/drivers/pmdomain/governor.c
index d1a10eeebd16..d1a10eeebd16 100644
--- a/drivers/base/power/domain_governor.c
+++ b/drivers/pmdomain/governor.c