On Tue 06 Oct 11:05 CDT 2020, Ulf Hansson wrote: > 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. > > Cc: Niklas Cassel <[email protected]> > Cc: Bjorn Andersson <[email protected]> > Cc: Andy Gross <[email protected]> > Cc: [email protected] > Signed-off-by: Ulf Hansson <[email protected]>
Acked-by: Bjorn Andersson <[email protected]> Regards, Bjorn > --- > MAINTAINERS | 2 +- > drivers/power/avs/Kconfig | 16 ---------------- > drivers/power/avs/Makefile | 1 - > drivers/soc/qcom/Kconfig | 16 ++++++++++++++++ > drivers/soc/qcom/Makefile | 1 + > drivers/{power/avs/qcom-cpr.c => soc/qcom/cpr.c} | 0 > 6 files changed, 18 insertions(+), 18 deletions(-) > rename drivers/{power/avs/qcom-cpr.c => soc/qcom/cpr.c} (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 4f1a56f6efaa..f51dd1944fe6 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -14337,7 +14337,7 @@ L: [email protected] > L: [email protected] > 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 <[email protected]> > diff --git a/drivers/power/avs/Kconfig b/drivers/power/avs/Kconfig > index cdb4237bfd02..089b6244b716 100644 > --- a/drivers/power/avs/Kconfig > +++ b/drivers/power/avs/Kconfig > @@ -12,22 +12,6 @@ menuconfig POWER_AVS > > Say Y here to enable Adaptive Voltage Scaling class support. > > -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 > - > config ROCKCHIP_IODOMAIN > tristate "Rockchip IO domain support" > depends on POWER_AVS && ARCH_ROCKCHIP && OF > diff --git a/drivers/power/avs/Makefile b/drivers/power/avs/Makefile > index 9007d05853e2..a1b8cd453f19 100644 > --- a/drivers/power/avs/Makefile > +++ b/drivers/power/avs/Makefile > @@ -1,4 +1,3 @@ > # SPDX-License-Identifier: GPL-2.0-only > obj-$(CONFIG_POWER_AVS_OMAP) += smartreflex.o > -obj-$(CONFIG_QCOM_CPR) += qcom-cpr.o > obj-$(CONFIG_ROCKCHIP_IODOMAIN) += rockchip-io-domain.o > diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig > index 3dc3e3d61ea3..6a3b69b43ad5 100644 > --- 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 93392d9dc7f7..ad675a6593d0 100644 > --- 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 > -- > 2.25.1 >
