PM: AVS: qcom-cpr: Move the driver to the qcom specific drivers

The avs drivers are all SoC specific drivers that doesn't share any code.
Instead they are located in a directory, mostly to keep similar
functionality together. From a maintenance point of view, it makes better
sense to collect SoC specific drivers like these, into the SoC specific
directories.

Therefore, let's move the qcom-cpr driver to the qcom directory.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: Niklas Cassel <nks@flawful.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 6c17687faa521a9f991b5b5fa4d668f8d3b23414..d08ff56e35b6c61e18269080ecad4844d08785e0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14354,7 +14354,7 @@ L:      linux-pm@vger.kernel.org
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
-F:     drivers/power/avs/qcom-cpr.c
+F:     drivers/soc/qcom/cpr.c
 
 QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
 M:     Ilia Lin <ilia.lin@kernel.org>

diff --git a/drivers/power/avs/Kconfig b/drivers/power/avs/Kconfig
index d789509ae7e9a8d67526f79d931a7a916dab94da..a4e40e534e6a84db241abfe5076962a90f8a71bd 100644 (file)
--- a/drivers/power/avs/Kconfig
+++ b/drivers/power/avs/Kconfig
@@ -1,17 +1 @@
 # SPDX-License-Identifier: GPL-2.0-only
-
-config QCOM_CPR
-       tristate "QCOM Core Power Reduction (CPR) support"
-       depends on POWER_AVS && HAS_IOMEM
-       select PM_OPP
-       select REGMAP
-       help
-         Say Y here to enable support for the CPR hardware found on Qualcomm
-         SoCs like QCS404.
-
-         This driver populates CPU OPPs tables and makes adjustments to the
-         tables based on feedback from the CPR hardware. If you want to do
-         CPUfrequency scaling say Y here.
-
-         To compile this driver as a module, choose M here: the module will
-         be called qcom-cpr

diff --git a/drivers/power/avs/Makefile b/drivers/power/avs/Makefile
index 735832f4721438a2073c7b6b76d254a426285a10..a4e40e534e6a84db241abfe5076962a90f8a71bd 100644 (file)
--- a/drivers/power/avs/Makefile
+++ b/drivers/power/avs/Makefile
@@ -1,2 +1 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_QCOM_CPR)                 += qcom-cpr.o

diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index 3dc3e3d61ea32eecd2e71530d3ffdc3201bd3f9a..6a3b69b43ad51a978205f0c98a249881b091ed7c 100644 (file)
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -26,6 +26,22 @@ config QCOM_COMMAND_DB
          resource on a RPM-hardened platform must use this database to get
          SoC specific identifier and information for the shared resources.
 
+config QCOM_CPR
+       tristate "QCOM Core Power Reduction (CPR) support"
+       depends on ARCH_QCOM && HAS_IOMEM
+       select PM_OPP
+       select REGMAP
+       help
+         Say Y here to enable support for the CPR hardware found on Qualcomm
+         SoCs like QCS404.
+
+         This driver populates CPU OPPs tables and makes adjustments to the
+         tables based on feedback from the CPR hardware. If you want to do
+         CPUfrequency scaling say Y here.
+
+         To compile this driver as a module, choose M here: the module will
+         be called qcom-cpr
+
 config QCOM_GENI_SE
        tristate "QCOM GENI Serial Engine Driver"
        depends on ARCH_QCOM || COMPILE_TEST

diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile
index 93392d9dc7f7a69c74d89be15a87188e33c5a8f5..ad675a6593d0dba7cdd81ef12bb32b9642f78c6f 100644 (file)
--- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@ -3,6 +3,7 @@ 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

diff --git a/drivers/power/avs/qcom-cpr.c b/drivers/soc/qcom/cpr.c
similarity index 100%
rename from drivers/power/avs/qcom-cpr.c
rename to drivers/soc/qcom/cpr.c