Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> writes:
> If an omap_hwmod is setup using HWMOD_INIT_NO_IDLE flag, there is
> currently way to idle it since omap_hwmod_idle() requires the hwmod to
> be in the enabled state.
>
> This patch adds a check to omap_hwmod_idle() so if the hwmod was has
> the INIT_NO_IDLE flag, calling omap_hwmod_idle() will still succeed.
>
> Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Retracting this patch as it is no longer necessary after recent
hwmod updates from Paul.
Kevin
> ---
> arch/arm/mach-omap2/omap_hwmod.c | 11 ++++++++++-
> 1 files changed, 10 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
> index 307deea..2de4cc3 100644
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> @@ -869,7 +869,13 @@ static int _enable(struct omap_hwmod *oh)
> */
> static int _idle(struct omap_hwmod *oh)
> {
> - if (oh->_state != _HWMOD_STATE_ENABLED) {
> + /*
> + * To idle, hwmod must be enabled, EXCEPT if hwmod was
> + * initialized using the INIT_NO_IDLE flag. In this case it
> + * will not yet be enabled so we have to allow it to be idled.
> + */
> + if ((oh->_state != _HWMOD_STATE_ENABLED) &&
> + !(oh->flags & HWMOD_INIT_NO_IDLE)) {
> WARN(1, "omap_hwmod: %s: idle state can only be entered from "
> "enabled state\n", oh->name);
> return -EINVAL;
> @@ -884,6 +890,9 @@ static int _idle(struct omap_hwmod *oh)
>
> oh->_state = _HWMOD_STATE_IDLE;
>
> + /* Clear init flag which should only affect first call to idle */
> + oh->flags &= ~HWMOD_INIT_NO_IDLE;
> +
> return 0;
> }
>
> --
> 1.6.6.rc2.1.g42108
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
