PM: AVS: smartreflex Move driver to soc 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 smartreflex driver for OMAP to the ti directory.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 8c5556df75a83b6e57cabdebd0fd3615044b577b..6c17687faa521a9f991b5b5fa4d668f8d3b23414 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5387,11 +5387,11 @@ F:      include/linux/debugfs.h
 F:     include/linux/kobj*
 F:     lib/kobj*
 
-DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
+DRIVERS FOR OMAP ADAPTIVE VOLTAGE SCALING (AVS)
 M:     Nishanth Menon <nm@ti.com>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
-F:     drivers/power/avs/
+F:     drivers/soc/ti/smartreflex.c
 F:     include/linux/power/smartreflex.h
 
 DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 93fd7fc537cf4259622e6bef6753ed6404b1866d..272670ef1e92dc7cd04e03691657a9dc71a4da73 100644 (file)
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -23,7 +23,7 @@ config OMAP_DEBUG_LEDS
 
 config POWER_AVS_OMAP
        bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2"
-       depends on POWER_AVS && (ARCH_OMAP3 || ARCH_OMAP4) && PM
+       depends on (ARCH_OMAP3 || ARCH_OMAP4) && PM
        select POWER_SUPPLY
        help
          Say Y to enable AVS(Adaptive Voltage Scaling)

diff --git a/drivers/power/avs/Kconfig b/drivers/power/avs/Kconfig
index e31215680771301f48bbc61f0a29d5876cf032e8..d789509ae7e9a8d67526f79d931a7a916dab94da 100644 (file)
--- a/drivers/power/avs/Kconfig
+++ b/drivers/power/avs/Kconfig
@@ -1,16 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
-menuconfig POWER_AVS
-       bool "Adaptive Voltage Scaling class support"
-       help
-         AVS is a power management technique which finely controls the
-         operating voltage of a device in order to optimize (i.e. reduce)
-         its power consumption.
-         At a given operating point the voltage is adapted depending on
-         static factors (chip manufacturing process) and dynamic factors
-         (temperature depending performance).
-         AVS is also called SmartReflex on OMAP devices.
-
-         Say Y here to enable Adaptive Voltage Scaling class support.
 
 config QCOM_CPR
        tristate "QCOM Core Power Reduction (CPR) support"

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

diff --git a/drivers/soc/ti/Makefile b/drivers/soc/ti/Makefile
index 1110e5c98685e5e669559ea23eeda83b6410506c..5463431ec96c8a977a3493800e553b0b0da06aae 100644 (file)
--- a/drivers/soc/ti/Makefile
+++ b/drivers/soc/ti/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_TI_SCI_PM_DOMAINS)               += ti_sci_pm_domains.o
 obj-$(CONFIG_TI_SCI_INTA_MSI_DOMAIN)   += ti_sci_inta_msi.o
 obj-$(CONFIG_TI_K3_RINGACC)            += k3-ringacc.o
 obj-$(CONFIG_TI_K3_SOCINFO)            += k3-socinfo.o
+obj-$(CONFIG_POWER_AVS_OMAP)           += smartreflex.o

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