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

Commit 0a4f841e authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Rafael J. Wysocki
Browse files

SH: cpuidle: initialize the driver's states directly 



Like all the other drivers, let's initialize the structure a compile time
instead of init time.

The states #1 and #2 are not enabled by default. The init function will
check the features of the board in order to enable the state.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 194db92f

arch/sh/kernel/cpu/shmobile/cpuidle.c

+42 −50
Original line number Diff line number Diff line
@@ -56,57 +56,49 @@ static struct cpuidle_driver cpuidle_driver = { 
	.name   = "sh_idle",

	.owner  = THIS_MODULE,

	.en_core_tk_irqen = 1,

	.states = {

		{

			.exit_latency = 1,

			.target_residency = 1 * 2,

			.power_usage = 3,

			.flags = CPUIDLE_FLAG_TIME_VALID,

			.enter = cpuidle_sleep_enter,

			.name = "C1",

			.desc = "SuperH Sleep Mode",

		},

		{

			.exit_latency = 100,

			.target_residency = 1 * 2,

			.power_usage = 1,

			.flags = CPUIDLE_FLAG_TIME_VALID,

			.enter = cpuidle_sleep_enter,

			.name = "C2",

			.desc = "SuperH Sleep Mode [SF]",

			.disabled = true,

		},

		{

			.exit_latency = 2300,

			.target_residency = 1 * 2,

			.power_usage = 1,

			.flags = CPUIDLE_FLAG_TIME_VALID,

			.enter = cpuidle_sleep_enter,

			.name = "C3",

			.desc = "SuperH Mobile Standby Mode [SF]",

			.disabled = true,

		},

	},

	.safe_state_index = 0,

	.state_count = 3,

};



void sh_mobile_setup_cpuidle(void)

{

	struct cpuidle_device *dev = &cpuidle_dev;

	struct cpuidle_driver *drv = &cpuidle_driver;

	struct cpuidle_state *state;

	int i = 0;



	state = &drv->states[i++];

	snprintf(state->name, CPUIDLE_NAME_LEN, "C1");

	strncpy(state->desc, "SuperH Sleep Mode", CPUIDLE_DESC_LEN);

	state->exit_latency = 1;

	state->target_residency = 1 * 2;

	state->power_usage = 3;

	state->flags = 0;

	state->flags |= CPUIDLE_FLAG_TIME_VALID;

	state->enter = cpuidle_sleep_enter;



	drv->safe_state_index = 0;



	if (sh_mobile_sleep_supported & SUSP_SH_SF) {

		state = &drv->states[i++];

		snprintf(state->name, CPUIDLE_NAME_LEN, "C2");

		strncpy(state->desc, "SuperH Sleep Mode [SF]",

			CPUIDLE_DESC_LEN);

		state->exit_latency = 100;

		state->target_residency = 1 * 2;

		state->power_usage = 1;

		state->flags = 0;

		state->flags |= CPUIDLE_FLAG_TIME_VALID;

		state->enter = cpuidle_sleep_enter;

	}



	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY) {

		state = &drv->states[i++];

		snprintf(state->name, CPUIDLE_NAME_LEN, "C3");

		strncpy(state->desc, "SuperH Mobile Standby Mode [SF]",

			CPUIDLE_DESC_LEN);

		state->exit_latency = 2300;

		state->target_residency = 1 * 2;

		state->power_usage = 1;

		state->flags = 0;

		state->flags |= CPUIDLE_FLAG_TIME_VALID;

		state->enter = cpuidle_sleep_enter;

	}



	drv->state_count = i;

	dev->state_count = i;

	if (sh_mobile_sleep_supported & SUSP_SH_SF)

		cpuidle_driver.states[1].disabled = false;



	cpuidle_register_driver(&cpuidle_driver);

	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)

		cpuidle_driver.states[2].disabled = false;



	cpuidle_register_device(dev);

	if (!cpuidle_register_driver(&cpuidle_driver))

		cpuidle_register_device(&cpuidle_dev);

}