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

Commit 648fcab2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpuidle' 

* pm-cpuidle:
  cpuidle: add MAINTAINERS entry for ARM Exynos cpuidle driver
  drivers: cpuidle: Remove cpuidle-arm64 duplicate error messages
  drivers: cpuidle: Add idle-state-name description to ARM idle states
  drivers: cpuidle: Add status property to ARM idle states
  cpuidle: Invert CPUIDLE_FLAG_TIME_VALID logic
parents 389cbf36 0c570c18

Documentation/devicetree/bindings/arm/idle-states.txt

+20 −0
Original line number Diff line number Diff line
@@ -317,6 +317,26 @@ follows: 
			    In such systems entry-latency-us + exit-latency-us

			    will exceed wakeup-latency-us by this duration.



	- status:

		Usage: Optional

		Value type: <string>

		Definition: A standard device tree property [5] that indicates

			    the operational status of an idle-state.

			    If present, it shall be:

			    "okay": to indicate that the idle state is

				    operational.

			    "disabled": to indicate that the idle state has

					been disabled in firmware so it is not

					operational.

			    If the property is not present the idle-state must

			    be considered operational.



	- idle-state-name:

		Usage: Optional

		Value type: <string>

		Definition: A string used as a descriptive name for the idle

			    state.



	In addition to the properties listed above, a state node may require

	additional properties specifics to the entry-method defined in the

	idle-states node, please refer to the entry-method bindings

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -2632,6 +2632,16 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git 
S:	Maintained

F:	drivers/cpuidle/cpuidle-big_little.c



CPUIDLE DRIVER - ARM EXYNOS

M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

M:	Daniel Lezcano <daniel.lezcano@linaro.org>

M:	Kukjin Kim <kgene@kernel.org>

L:	linux-pm@vger.kernel.org

L:	linux-samsung-soc@vger.kernel.org

S:	Supported

F:	drivers/cpuidle/cpuidle-exynos.c

F:	arch/arm/mach-exynos/pm.c



CPUIDLE DRIVERS

M:	Rafael J. Wysocki <rjw@rjwysocki.net>

M:	Daniel Lezcano <daniel.lezcano@linaro.org>

arch/arm/include/asm/cpuidle.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ static inline int arm_cpuidle_simple_enter(struct cpuidle_device *dev, 
	.exit_latency           = 1,\

	.target_residency       = 1,\

	.power_usage		= p,\

	.flags                  = CPUIDLE_FLAG_TIME_VALID,\

	.name                   = "WFI",\

	.desc                   = "ARM WFI",\

}

arch/arm/mach-davinci/cpuidle.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static struct cpuidle_driver davinci_idle_driver = { 
		.enter			= davinci_enter_idle,

		.exit_latency		= 10,

		.target_residency	= 10000,

		.flags			= CPUIDLE_FLAG_TIME_VALID,

		.name			= "DDR SR",

		.desc			= "WFI and DDR Self Refresh",

	},

arch/arm/mach-imx/cpuidle-imx5.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ static struct cpuidle_driver imx5_cpuidle_driver = { 
		.enter            = imx5_cpuidle_enter,

		.exit_latency     = 2,

		.target_residency = 1,

		.flags            = CPUIDLE_FLAG_TIME_VALID,

		.name             = "IMX5 SRPG",

		.desc             = "CPU state retained,powered off",

	},