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

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

Merge branch 'cpuidle/4.0-fixes' of... 

Merge branch 'cpuidle/4.0-fixes' of http://git.linaro.org/people/daniel.lezcano/linux into pm-cpuidle

Pull ARM cpuidle fixes for v4.0 from Daniel Lezcano.

* 'cpuidle/4.0-fixes' of http://git.linaro.org/people/daniel.lezcano/linux:
  cpuidle: mvebu: Update cpuidle thresholds for Armada XP SOCs
  cpuidle: mvebu: Fix the CPU PM notifier usage
parents b1760233 ce6031c8

drivers/cpuidle/cpuidle-mvebu-v7.c

+6 −6
Original line number Diff line number Diff line
@@ -37,11 +37,11 @@ static int mvebu_v7_enter_idle(struct cpuidle_device *dev, 
		deepidle = true;



	ret = mvebu_v7_cpu_suspend(deepidle);

	cpu_pm_exit();



	if (ret)

		return ret;



	cpu_pm_exit();



	return index;

}
@@ -50,17 +50,17 @@ static struct cpuidle_driver armadaxp_idle_driver = { 
	.states[0]		= ARM_CPUIDLE_WFI_STATE,

	.states[1]		= {

		.enter			= mvebu_v7_enter_idle,

		.exit_latency		= 10,

		.exit_latency		= 100,

		.power_usage		= 50,

		.target_residency	= 100,

		.target_residency	= 1000,

		.name			= "MV CPU IDLE",

		.desc			= "CPU power down",

	},

	.states[2]		= {

		.enter			= mvebu_v7_enter_idle,

		.exit_latency		= 100,

		.exit_latency		= 1000,

		.power_usage		= 5,

		.target_residency	= 1000,

		.target_residency	= 10000,

		.flags			= MVEBU_V7_FLAG_DEEP_IDLE,

		.name			= "MV CPU DEEP IDLE",

		.desc			= "CPU and L2 Fabric power down",