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

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

Merge back earlier cpuidle material for 3.19-rc1. 

Conflicts:
	drivers/cpuidle/dt_idle_states.c
parents a74a5a33 b82b6cca

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

	},

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

+1 −2
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ static struct cpuidle_driver imx6q_cpuidle_driver = { 
		{

			.exit_latency = 50,

			.target_residency = 75,

			.flags = CPUIDLE_FLAG_TIME_VALID |

			         CPUIDLE_FLAG_TIMER_STOP,

			.flags = CPUIDLE_FLAG_TIMER_STOP,

			.enter = imx6q_enter_wait,

			.name = "WAIT",

			.desc = "Clock off",

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

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ static struct cpuidle_driver imx6sl_cpuidle_driver = { 
		{

			.exit_latency = 50,

			.target_residency = 75,

			.flags = CPUIDLE_FLAG_TIME_VALID |

				CPUIDLE_FLAG_TIMER_STOP,

			.flags = CPUIDLE_FLAG_TIMER_STOP,

			.enter = imx6sl_enter_wait,

			.name = "WAIT",

			.desc = "Clock off",