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

Commit 6da45dce authored by Robert Lee's avatar Robert Lee Committed by Len Brown
Browse files

ARM: omap: Consolidate OMAP3 time keeping and irq enable 



Use core cpuidle timekeeping and irqen wrapper and remove that
handling from this code.

Signed-off-by: default avatarRobert Lee <rob.lee@linaro.org>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
Reviewed-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: default avatarJean Pihet <j-pihet@ti.com>
Acked-by: default avatarJean Pihet <j-pihet@ti.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 19976c2a

arch/arm/mach-omap2/cpuidle34xx.c

+17 −25
Original line number Diff line number Diff line
@@ -87,29 +87,14 @@ static int _cpuidle_deny_idle(struct powerdomain *pwrdm, 
	return 0;

}



/**

 * omap3_enter_idle - Programs OMAP3 to enter the specified state

 * @dev: cpuidle device

 * @drv: cpuidle driver

 * @index: the index of state to be entered

 *

 * Called from the CPUidle framework to program the device to the

 * specified target state selected by the governor.

 */

static int omap3_enter_idle(struct cpuidle_device *dev,

static int __omap3_enter_idle(struct cpuidle_device *dev,

				struct cpuidle_driver *drv,

				int index)

{

	struct omap3_idle_statedata *cx =

			cpuidle_get_statedata(&dev->states_usage[index]);

	struct timespec ts_preidle, ts_postidle, ts_idle;

	u32 mpu_state = cx->mpu_state, core_state = cx->core_state;

	int idle_time;



	/* Used to keep track of the total time in idle */

	getnstimeofday(&ts_preidle);



	local_irq_disable();

	local_fiq_disable();



	pwrdm_set_next_pwrst(mpu_pd, mpu_state);
@@ -148,21 +133,28 @@ static int omap3_enter_idle(struct cpuidle_device *dev, 
	}



return_sleep_time:

	getnstimeofday(&ts_postidle);

	ts_idle = timespec_sub(ts_postidle, ts_preidle);



	local_irq_enable();

	local_fiq_enable();



	idle_time = ts_idle.tv_nsec / NSEC_PER_USEC + ts_idle.tv_sec * \

								USEC_PER_SEC;



	/* Update cpuidle counters */

	dev->last_residency = idle_time;



	return index;

}



/**

 * omap3_enter_idle - Programs OMAP3 to enter the specified state

 * @dev: cpuidle device

 * @drv: cpuidle driver

 * @index: the index of state to be entered

 *

 * Called from the CPUidle framework to program the device to the

 * specified target state selected by the governor.

 */

static inline int omap3_enter_idle(struct cpuidle_device *dev,

				struct cpuidle_driver *drv,

				int index)

{

	return cpuidle_wrap_enter(dev, drv, index, __omap3_enter_idle);

}



/**

 * next_valid_state - Find next valid C-state

 * @dev: cpuidle device