[PATCH 08/18] soc: qcom: Move power-domain drivers to the genpd dir

[Ulf Hansson]

Cc: Bjorn Andersson <andersson at kernel.org>
Cc: Konrad Dybcio <konrad.dybcio at linaro.org>
Cc: Andy Gross <agross at kernel.org>
Cc: <linux-arm-msm at vger.kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson at linaro.org>
---
 MAINTAINERS                          | 2 +-
 drivers/genpd/Makefile               | 1 +
 drivers/genpd/qcom/Makefile          | 4 ++++
 drivers/{soc => genpd}/qcom/cpr.c    | 0
 drivers/{soc => genpd}/qcom/rpmhpd.c | 0
 drivers/{soc => genpd}/qcom/rpmpd.c  | 0
 drivers/soc/qcom/Makefile            | 3 ---
 7 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 drivers/genpd/qcom/Makefile
 rename drivers/{soc => genpd}/qcom/cpr.c (100%)
 rename drivers/{soc => genpd}/qcom/rpmhpd.c (100%)
 rename drivers/{soc => genpd}/qcom/rpmpd.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9fad7f6033f4..753eea641129 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17518,7 +17518,7 @@ L:	linux-pm at vger.kernel.org
 L:	linux-arm-msm at vger.kernel.org
 S:	Maintained
 F:	Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
-F:	drivers/soc/qcom/cpr.c
+F:	drivers/genpd/qcom/cpr.c
 
 QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
 M:	Ilia Lin <ilia.lin at kernel.org>
diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile
index 1a0a56925756..dfdea14e2a8a 100644
--- a/drivers/genpd/Makefile
+++ b/drivers/genpd/Makefile
@@ -4,3 +4,4 @@ obj-y					+= amlogic/
 obj-y					+= apple/
 obj-y					+= bcm/
 obj-y					+= mediatek/
+obj-y					+= qcom/
diff --git a/drivers/genpd/qcom/Makefile b/drivers/genpd/qcom/Makefile
new file mode 100644
index 000000000000..403dfc5af095
--- /dev/null
+++ b/drivers/genpd/qcom/Makefile
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_QCOM_CPR)		+= cpr.o
+obj-$(CONFIG_QCOM_RPMPD)	+= rpmpd.o
+obj-$(CONFIG_QCOM_RPMHPD)	+= rpmhpd.o
diff --git a/drivers/soc/qcom/cpr.c b/drivers/genpd/qcom/cpr.c
similarity index 100%
rename from drivers/soc/qcom/cpr.c
rename to drivers/genpd/qcom/cpr.c
diff --git a/drivers/soc/qcom/rpmhpd.c b/drivers/genpd/qcom/rpmhpd.c
similarity index 100%
rename from drivers/soc/qcom/rpmhpd.c
rename to drivers/genpd/qcom/rpmhpd.c
diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/genpd/qcom/rpmpd.c
similarity index 100%
rename from drivers/soc/qcom/rpmpd.c
rename to drivers/genpd/qcom/rpmpd.c
diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile
index 99114c71092b..f548a7150bb2 100644
--- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@ -3,7 +3,6 @@ CFLAGS_rpmh-rsc.o := -I$(src)
 obj-$(CONFIG_QCOM_AOSS_QMP) +=	qcom_aoss.o
 obj-$(CONFIG_QCOM_GENI_SE) +=	qcom-geni-se.o
 obj-$(CONFIG_QCOM_COMMAND_DB) += cmd-db.o
-obj-$(CONFIG_QCOM_CPR)		+= cpr.o
 obj-$(CONFIG_QCOM_GSBI)	+=	qcom_gsbi.o
 obj-$(CONFIG_QCOM_MDT_LOADER)	+= mdt_loader.o
 obj-$(CONFIG_QCOM_OCMEM)	+= ocmem.o
@@ -29,8 +28,6 @@ obj-$(CONFIG_QCOM_STATS)	+= qcom_stats.o
 obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o
 obj-$(CONFIG_QCOM_APR) += apr.o
 obj-$(CONFIG_QCOM_LLCC) += llcc-qcom.o
-obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o
-obj-$(CONFIG_QCOM_RPMPD) += rpmpd.o
 obj-$(CONFIG_QCOM_KRYO_L2_ACCESSORS) +=	kryo-l2-accessors.o
 obj-$(CONFIG_QCOM_ICC_BWMON)	+= icc-bwmon.o
 qcom_ice-objs			+= ice.o
-- 
2.34.1