Commit 12af39ca authored by Andreas Kemnade's avatar Andreas Kemnade Committed by Tero Kristo
Browse files

ARM: OMAP2+: hwmod: disable ick autoidling when a hwmod requires that 



Deny autoidle for hwmods with the OCPIF_SWSUP_IDLE flag,
that makes hwmods working properly which cannot handle
autoidle properly in lower power states.
Affected is e. g. the omap_hdq.
Since an ick might have mulitple users, autoidle is disabled
when an individual user requires that rather than in
_setup_iclk_autoidle. dss_ick is an example for that.

Signed-off-by: default avatarAndreas Kemnade <andreas@kemnade.info>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarKeerthy <j-keerthy@ti.com>
Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
parent fddf4e29

arch/arm/mach-omap2/omap_hwmod.c

+12 −4
Original line number Diff line number Diff line
@@ -1002,9 +1002,11 @@ static int _enable_clocks(struct omap_hwmod *oh) 
		clk_enable(oh->_clk);



	list_for_each_entry(os, &oh->slave_ports, node) {

		if (os->_clk && (os->flags & OCPIF_SWSUP_IDLE))

		if (os->_clk && (os->flags & OCPIF_SWSUP_IDLE)) {

			omap2_clk_deny_idle(os->_clk);

			clk_enable(os->_clk);

		}

	}



	/* The opt clocks are controlled by the device driver. */
@@ -1055,8 +1057,10 @@ static int _disable_clocks(struct omap_hwmod *oh) 
		clk_disable(oh->_clk);



	list_for_each_entry(os, &oh->slave_ports, node) {

		if (os->_clk && (os->flags & OCPIF_SWSUP_IDLE))

		if (os->_clk && (os->flags & OCPIF_SWSUP_IDLE)) {

			clk_disable(os->_clk);

			omap2_clk_allow_idle(os->_clk);

		}

	}



	if (oh->flags & HWMOD_OPT_CLKS_NEEDED)
@@ -2436,9 +2440,13 @@ static void _setup_iclk_autoidle(struct omap_hwmod *oh) 
			continue;



		if (os->flags & OCPIF_SWSUP_IDLE) {

			/* XXX omap_iclk_deny_idle(c); */

			/*

			 * we might have multiple users of one iclk with

			 * different requirements, disable autoidle when

			 * the module is enabled, e.g. dss iclk

			 */

		} else {

			/* XXX omap_iclk_allow_idle(c); */

			/* we are enabling autoidle afterwards anyways */

			clk_enable(os->_clk);

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE