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

Commit 5a68a736 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Paul Walmsley
Browse files

ARM: OMAP2+: powerdomain: Get rid off duplicate pwrdm_clkdm_state_switch() API 



With patch 'ARM: OMAP2+: powerdomain: Wait for powerdomain transition
in pwrdm_state_switch()', the pwrdm_clkdm_state_switch() API becomes
duplicate of pwrdm_state_switch().

Get rid off duplicate pwrdm_clkdm_state_switch() and update the
users of it with pwrdm_state_switch()

Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 96566043

arch/arm/mach-omap2/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ void omap2_clk_disable_unused(struct clk *clk) 
		clk->ops->disable(clk);

	}

	if (clk->clkdm != NULL)

		pwrdm_clkdm_state_switch(clk->clkdm);

		pwrdm_state_switch(clk->clkdm->pwrdm.ptr);

}

#endif

arch/arm/mach-omap2/clockdomain.c

+3 −4
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ void clkdm_allow_idle(struct clockdomain *clkdm) 
	spin_lock_irqsave(&clkdm->lock, flags);

	clkdm->_flags |= _CLKDM_FLAG_HWSUP_ENABLED;

	arch_clkdm->clkdm_allow_idle(clkdm);

	pwrdm_clkdm_state_switch(clkdm);

	pwrdm_state_switch(clkdm->pwrdm.ptr);

	spin_unlock_irqrestore(&clkdm->lock, flags);

}
@@ -924,8 +924,7 @@ static int _clkdm_clk_hwmod_enable(struct clockdomain *clkdm) 


	spin_lock_irqsave(&clkdm->lock, flags);

	arch_clkdm->clkdm_clk_enable(clkdm);

	pwrdm_wait_transition(clkdm->pwrdm.ptr);

	pwrdm_clkdm_state_switch(clkdm);

	pwrdm_state_switch(clkdm->pwrdm.ptr);

	spin_unlock_irqrestore(&clkdm->lock, flags);



	pr_debug("clockdomain: clkdm %s: enabled\n", clkdm->name);
@@ -950,7 +949,7 @@ static int _clkdm_clk_hwmod_disable(struct clockdomain *clkdm) 


	spin_lock_irqsave(&clkdm->lock, flags);

	arch_clkdm->clkdm_clk_disable(clkdm);

	pwrdm_clkdm_state_switch(clkdm);

	pwrdm_state_switch(clkdm->pwrdm.ptr);

	spin_unlock_irqrestore(&clkdm->lock, flags);



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

arch/arm/mach-omap2/powerdomain.c

+0 −10
Original line number Diff line number Diff line
@@ -981,16 +981,6 @@ int pwrdm_state_switch(struct powerdomain *pwrdm) 
	return ret;

}



int pwrdm_clkdm_state_switch(struct clockdomain *clkdm)

{

	if (clkdm != NULL && clkdm->pwrdm.ptr != NULL) {

		pwrdm_wait_transition(clkdm->pwrdm.ptr);

		return pwrdm_state_switch(clkdm->pwrdm.ptr);

	}



	return -EINVAL;

}



int pwrdm_pre_transition(void)

{

	pwrdm_for_each(_pwrdm_pre_transition_cb, NULL);

arch/arm/mach-omap2/powerdomain.h

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm); 
int pwrdm_wait_transition(struct powerdomain *pwrdm);



int pwrdm_state_switch(struct powerdomain *pwrdm);

int pwrdm_clkdm_state_switch(struct clockdomain *clkdm);

int pwrdm_pre_transition(void);

int pwrdm_post_transition(void);

int pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm);