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

Commit cc3af91b authored Jan 26, 2013 by Paul Walmsley

ARM: OMAP2xxx: CM: remove autodep handling



There's no need to preserve the autodep handling code in
mach-omap2/cm2xxx.c, since no autodeps are defined for these chips.
Hopefully they'll never be needed, but if in some future case they are,
this code can be added back in.

Signed-off-by: Paul Walmsley <paul@pwsan.com>

parent 3a090284

arch/arm/mach-omap2/cm2xxx.c

+4 −29

Original line number	Diff line number	Diff line
		@@ -273,9 +273,6 @@ int omap2xxx_cm_wait_module_ready(s16 prcm_mod, u8 idlest_id, u8 idlest_shift)

		static void omap2xxx_clkdm_allow_idle(struct clockdomain *clkdm)
		{
		if (atomic_read(&clkdm->usecount) > 0)
		_clkdm_add_autodeps(clkdm);

		omap2xxx_cm_clkdm_enable_hwsup(clkdm->pwrdm.ptr->prcm_offs,
		clkdm->clktrctrl_mask);
		}
		@@ -284,9 +281,6 @@ static void omap2xxx_clkdm_deny_idle(struct clockdomain *clkdm)
		{
		omap2xxx_cm_clkdm_disable_hwsup(clkdm->pwrdm.ptr->prcm_offs,
		clkdm->clktrctrl_mask);

		if (atomic_read(&clkdm->usecount) > 0)
		_clkdm_del_autodeps(clkdm);
		}

		static int omap2xxx_clkdm_clk_enable(struct clockdomain *clkdm)
		@@ -298,18 +292,8 @@ static int omap2xxx_clkdm_clk_enable(struct clockdomain *clkdm)

		hwsup = omap2xxx_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs,
		clkdm->clktrctrl_mask);

		if (hwsup) {
		/* Disable HW transitions when we are changing deps */
		omap2xxx_cm_clkdm_disable_hwsup(clkdm->pwrdm.ptr->prcm_offs,
		clkdm->clktrctrl_mask);
		_clkdm_add_autodeps(clkdm);
		omap2xxx_cm_clkdm_enable_hwsup(clkdm->pwrdm.ptr->prcm_offs,
		clkdm->clktrctrl_mask);
		} else {
		if (clkdm->flags & CLKDM_CAN_FORCE_WAKEUP)
		if (!hwsup && clkdm->flags & CLKDM_CAN_FORCE_WAKEUP)
		omap2xxx_clkdm_wakeup(clkdm);
		}

		return 0;
		}
		@@ -324,17 +308,8 @@ static int omap2xxx_clkdm_clk_disable(struct clockdomain *clkdm)
		hwsup = omap2xxx_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs,
		clkdm->clktrctrl_mask);

		if (hwsup) {
		/* Disable HW transitions when we are changing deps */
		omap2xxx_cm_clkdm_disable_hwsup(clkdm->pwrdm.ptr->prcm_offs,
		clkdm->clktrctrl_mask);
		_clkdm_del_autodeps(clkdm);
		omap2xxx_cm_clkdm_enable_hwsup(clkdm->pwrdm.ptr->prcm_offs,
		clkdm->clktrctrl_mask);
		} else {
		if (clkdm->flags & CLKDM_CAN_FORCE_SLEEP)
		if (!hwsup && clkdm->flags & CLKDM_CAN_FORCE_SLEEP)
		omap2xxx_clkdm_sleep(clkdm);
		}

		return 0;
		}