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

Commit bfb7dd25 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP3xxx: clockdomain: fix software supervised wakeup/sleep 



Commit 4da71ae6 ("OMAP: clockdomain: Arch specific funcs for
clkdm_clk_enable/disable") called the OMAP2xxx-specific functions for
clockdomain wakeup and sleep.  This would probably have broken
software-supervised clockdomain wakeup and sleep on OMAP3.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Jon Hunter <jon-hunter@ti.com>
Acked-by: default avatarRajendra Nayak <rnayak@ti.com>
parent 4cbe5a55

arch/arm/mach-omap2/clockdomain2xxx_3xxx.c

+48 −2
Original line number Diff line number Diff line
@@ -241,6 +241,52 @@ static void omap3_clkdm_deny_idle(struct clockdomain *clkdm) 
		_clkdm_del_autodeps(clkdm);

}



static int omap3xxx_clkdm_clk_enable(struct clockdomain *clkdm)

{

	bool hwsup = false;



	if (!clkdm->clktrctrl_mask)

		return 0;



	hwsup = omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs,

				clkdm->clktrctrl_mask);



	if (hwsup) {

		/* Disable HW transitions when we are changing deps */

		_disable_hwsup(clkdm);

		_clkdm_add_autodeps(clkdm);

		_enable_hwsup(clkdm);

	} else {

		if (clkdm->flags & CLKDM_CAN_FORCE_WAKEUP)

			omap3_clkdm_wakeup(clkdm);

	}



	return 0;

}



static int omap3xxx_clkdm_clk_disable(struct clockdomain *clkdm)

{

	bool hwsup = false;



	if (!clkdm->clktrctrl_mask)

		return 0;



	hwsup = omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs,

				clkdm->clktrctrl_mask);



	if (hwsup) {

		/* Disable HW transitions when we are changing deps */

		_disable_hwsup(clkdm);

		_clkdm_del_autodeps(clkdm);

		_enable_hwsup(clkdm);

	} else {

		if (clkdm->flags & CLKDM_CAN_FORCE_SLEEP)

			omap3_clkdm_sleep(clkdm);

	}



	return 0;

}



struct clkdm_ops omap2_clkdm_operations = {

	.clkdm_add_wkdep	= omap2_clkdm_add_wkdep,

	.clkdm_del_wkdep	= omap2_clkdm_del_wkdep,
@@ -267,6 +313,6 @@ struct clkdm_ops omap3_clkdm_operations = { 
	.clkdm_wakeup		= omap3_clkdm_wakeup,

	.clkdm_allow_idle	= omap3_clkdm_allow_idle,

	.clkdm_deny_idle	= omap3_clkdm_deny_idle,

	.clkdm_clk_enable	= omap2_clkdm_clk_enable,

	.clkdm_clk_disable	= omap2_clkdm_clk_disable,

	.clkdm_clk_enable	= omap3xxx_clkdm_clk_enable,

	.clkdm_clk_disable	= omap3xxx_clkdm_clk_disable,

};