Commit 21a18129 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Simplify code for clkdm_clock_enable and disable 



We can make clkdm_clk_enable() usable for clkdm_hwmod_enable() by
dropping the unused clock check, and drop _clkdm_clk_hwmod_enable().

And we can make clkdm_hwmod_disable() call clkdm_hwmod_disable() and drop
the duplicate code in clkdm_hwmod_disable().

Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 645ad6f3

arch/arm/mach-omap2/clockdomain.c

+20 −58
Original line number Diff line number Diff line
@@ -1147,7 +1147,21 @@ void clkdm_del_autodeps(struct clockdomain *clkdm) 


/* Clockdomain-to-clock/hwmod framework interface code */



static int _clkdm_clk_hwmod_enable(struct clockdomain *clkdm)

/**

 * clkdm_clk_enable - add an enabled downstream clock to this clkdm

 * @clkdm: struct clockdomain *

 * @clk: struct clk * of the enabled downstream clock

 *

 * Increment the usecount of the clockdomain @clkdm and ensure that it

 * is awake before @clk is enabled.  Intended to be called by

 * clk_enable() code.  If the clockdomain is in software-supervised

 * idle mode, force the clockdomain to wake.  If the clockdomain is in

 * hardware-supervised idle mode, add clkdm-pwrdm autodependencies, to

 * ensure that devices in the clockdomain can be read from/written to

 * by on-chip processors.  Returns -EINVAL if passed null pointers;

 * returns 0 upon success or if the clockdomain is in hwsup idle mode.

 */

int clkdm_clk_enable(struct clockdomain *clkdm, struct clk *unused)

{

	if (!clkdm || !arch_clkdm || !arch_clkdm->clkdm_clk_enable)

		return -EINVAL;
@@ -1174,33 +1188,6 @@ static int _clkdm_clk_hwmod_enable(struct clockdomain *clkdm) 
	return 0;

}



/**

 * clkdm_clk_enable - add an enabled downstream clock to this clkdm

 * @clkdm: struct clockdomain *

 * @clk: struct clk * of the enabled downstream clock

 *

 * Increment the usecount of the clockdomain @clkdm and ensure that it

 * is awake before @clk is enabled.  Intended to be called by

 * clk_enable() code.  If the clockdomain is in software-supervised

 * idle mode, force the clockdomain to wake.  If the clockdomain is in

 * hardware-supervised idle mode, add clkdm-pwrdm autodependencies, to

 * ensure that devices in the clockdomain can be read from/written to

 * by on-chip processors.  Returns -EINVAL if passed null pointers;

 * returns 0 upon success or if the clockdomain is in hwsup idle mode.

 */

int clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk)

{

	/*

	 * XXX Rewrite this code to maintain a list of enabled

	 * downstream clocks for debugging purposes?

	 */



	if (!clk)

		return -EINVAL;



	return _clkdm_clk_hwmod_enable(clkdm);

}



/**

 * clkdm_clk_disable - remove an enabled downstream clock from this clkdm

 * @clkdm: struct clockdomain *
@@ -1216,13 +1203,13 @@ int clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk) 
 */

int clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk)

{

	if (!clkdm || !clk || !arch_clkdm || !arch_clkdm->clkdm_clk_disable)

	if (!clkdm || !arch_clkdm || !arch_clkdm->clkdm_clk_disable)

		return -EINVAL;



	pwrdm_lock(clkdm->pwrdm.ptr);



	/* corner case: disabling unused clocks */

	if ((__clk_get_enable_count(clk) == 0) && clkdm->usecount == 0)

	if (clk && (__clk_get_enable_count(clk) == 0) && clkdm->usecount == 0)

		goto ccd_exit;



	if (clkdm->usecount == 0) {
@@ -1277,7 +1264,7 @@ int clkdm_hwmod_enable(struct clockdomain *clkdm, struct omap_hwmod *oh) 
	if (!oh)

		return -EINVAL;



	return _clkdm_clk_hwmod_enable(clkdm);

	return clkdm_clk_enable(clkdm, NULL);

}



/**
@@ -1300,35 +1287,10 @@ int clkdm_hwmod_disable(struct clockdomain *clkdm, struct omap_hwmod *oh) 
	if (cpu_is_omap24xx() || cpu_is_omap34xx())

		return 0;



	/*

	 * XXX Rewrite this code to maintain a list of enabled

	 * downstream hwmods for debugging purposes?

	 */



	if (!clkdm || !oh || !arch_clkdm || !arch_clkdm->clkdm_clk_disable)

	if (!oh)

		return -EINVAL;



	pwrdm_lock(clkdm->pwrdm.ptr);



	if (clkdm->usecount == 0) {

		pwrdm_unlock(clkdm->pwrdm.ptr);

		WARN_ON(1); /* underflow */

		return -ERANGE;

	}



	clkdm->usecount--;

	if (clkdm->usecount > 0) {

		pwrdm_unlock(clkdm->pwrdm.ptr);

		return 0;

	}



	arch_clkdm->clkdm_clk_disable(clkdm);

	pwrdm_state_switch_nolock(clkdm->pwrdm.ptr);

	pwrdm_unlock(clkdm->pwrdm.ptr);



	pr_debug("clockdomain: %s: disabled\n", clkdm->name);



	return 0;

	return clkdm_clk_disable(clkdm, NULL);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE