Commit 3a56fe68 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-cpufreq-sched' 

* pm-cpuidle:
  cpuidle: Add 'above' and 'below' idle state metrics
  cpuidle: big.LITTLE: fix refcount leak
  cpuidle: Add cpuidle.governor= command line parameter
  cpuidle: poll_state: Disregard disable idle states
  Documentation: admin-guide: PM: Add cpuidle document

* pm-cpufreq:
  cpufreq: qcom-hw: Add support for QCOM cpufreq HW driver
  dt-bindings: cpufreq: Introduce QCOM cpufreq firmware bindings
  cpufreq: nforce2: Remove meaningless return
  cpufreq: ia64: Remove unused header files
  cpufreq: imx6q: save one condition block for normal case of nvmem read
  cpufreq: imx6q: remove unused code
  cpufreq: pmac64: add of_node_put()
  cpufreq: powernv: add of_node_put()
  Documentation: intel_pstate: Clarify coordination of P-State limits
  cpufreq: intel_pstate: Force HWP min perf before offline
  cpufreq: s3c24xx: Change to use DEFINE_SHOW_ATTRIBUTE macro

* pm-cpufreq-sched:
  sched/cpufreq: Add the SPDX tags
parents 7edcbbf2 04dab58a 2849dd8b 108c35a9

Documentation/ABI/testing/sysfs-devices-system-cpu

+7 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ What: /sys/devices/system/cpu/cpuX/cpuidle/stateN/name 
		/sys/devices/system/cpu/cpuX/cpuidle/stateN/power

		/sys/devices/system/cpu/cpuX/cpuidle/stateN/time

		/sys/devices/system/cpu/cpuX/cpuidle/stateN/usage

		/sys/devices/system/cpu/cpuX/cpuidle/stateN/above

		/sys/devices/system/cpu/cpuX/cpuidle/stateN/below

Date:		September 2007

KernelVersion:	v2.6.24

Contact:	Linux power management list <linux-pm@vger.kernel.org>
@@ -166,6 +168,11 @@ Description: 


		usage: (RO) Number of times this state was entered (a count).



		above: (RO) Number of times this state was entered, but the

		       observed CPU idle duration was too short for it (a count).



		below: (RO) Number of times this state was entered, but the

		       observed CPU idle duration was too long for it (a count).



What:		/sys/devices/system/cpu/cpuX/cpuidle/stateN/desc

Date:		February 2008

Documentation/admin-guide/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -674,6 +674,9 @@ 
	cpuidle.off=1	[CPU_IDLE]

			disable the cpuidle sub-system



	cpuidle.governor=

			[CPU_IDLE] Name of the cpuidle governor to use.



	cpufreq.off=1	[CPU_FREQ]

			disable the cpufreq sub-system