Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28da4395 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpufreq-sched' and 'pm-opp' 

* pm-cpufreq-sched:
  cpufreq: schedutil: Reset cached_raw_freq when not in sync with next_freq

* pm-opp:
  PM / OPP: Add dev_pm_opp_{un}register_get_pstate_helper()
  PM / OPP: Support updating performance state of device's power domain
  PM / OPP: add missing of_node_put() for of_get_cpu_node()
  PM / OPP: Rename dev_pm_opp_register_put_opp_helper()
  PM / OPP: Add missing of_node_put(np)
  PM / OPP: Move error message to debug level
  PM / OPP: Use snprintf() to avoid kasprintf() and kfree()
  PM / OPP: Move the OPP directory out of power/
parents 60af981c 07458f6a b6aa9836

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10049,7 +10049,7 @@ M: Stephen Boyd <sboyd@codeaurora.org> 
L:	linux-pm@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git

F:	drivers/base/power/opp/

F:	drivers/opp/

F:	include/linux/pm_opp.h

F:	Documentation/power/opp.txt

F:	Documentation/devicetree/bindings/opp/

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -209,4 +209,6 @@ source "drivers/tee/Kconfig" 


source "drivers/mux/Kconfig"



source "drivers/opp/Kconfig"



endmenu

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ obj-$(CONFIG_ACCESSIBILITY) += accessibility/ 
obj-$(CONFIG_ISDN)		+= isdn/

obj-$(CONFIG_EDAC)		+= edac/

obj-$(CONFIG_EISA)		+= eisa/

obj-$(CONFIG_PM_OPP)		+= opp/

obj-$(CONFIG_CPU_FREQ)		+= cpufreq/

obj-$(CONFIG_CPU_IDLE)		+= cpuidle/

obj-y				+= mmc/

drivers/base/power/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
obj-$(CONFIG_PM)	+= sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o

obj-$(CONFIG_PM_SLEEP)	+= main.o wakeup.o

obj-$(CONFIG_PM_TRACE_RTC)	+= trace.o

obj-$(CONFIG_PM_OPP)	+= opp/

obj-$(CONFIG_PM_GENERIC_DOMAINS)	+=  domain.o domain_governor.o

obj-$(CONFIG_HAVE_CLK)	+= clock_ops.o

drivers/opp/Kconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
config PM_OPP

	bool

	select SRCU

	---help---

	  SOCs have a standard set of tuples consisting of frequency and

	  voltage pairs that the device will support per voltage domain. This

	  is called Operating Performance Point or OPP. The actual definitions

	  of OPP varies over silicon within the same family of devices.



	  OPP layer organizes the data internally using device pointers

	  representing individual voltage domains and provides SOC

	  implementations a ready to use framework to manage OPPs.

	  For more information, read <file:Documentation/power/opp.txt>