Commit 41c169d9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-avs' 

* pm-avs:
  PM: AVS: Drop the avs directory and the corresponding Kconfig
  PM: AVS: qcom-cpr: Move the driver to the qcom specific drivers
  PM: AVS: smartreflex Move driver to soc specific drivers
  PM: AVS: rockchip-io: Move the driver to the rockchip specific drivers
parents 71d47b53 785b5bb4

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -5395,11 +5395,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










@@ -14362,7 +14362,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>


































arch/arm/plat-omap/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -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)


































drivers/power/Kconfig



+0
−1






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









source "drivers/power/avs/Kconfig"









source "drivers/power/reset/Kconfig"









source "drivers/power/supply/Kconfig"
























drivers/power/Makefile



+0
−1






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









obj-$(CONFIG_POWER_AVS)		+= avs/









obj-$(CONFIG_POWER_RESET)	+= reset/









obj-$(CONFIG_POWER_SUPPLY)	+= supply/
























drivers/power/avs/Kconfig
deleted100644 → 0



+0
−37






























Original line number
Diff line number
Diff line









# 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"









	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









	help









	  Say y here to enable support io domains on Rockchip SoCs. It is









	  necessary for the io domain setting of the SoC to match the









	  voltage supplied by the regulators.