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

Commit 353cec46 authored by Vaibhav Hiremath's avatar Vaibhav Hiremath Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c 



In order to remove unnecessary idefs, move noncore and core
dpll ops to dpll3xxx.c file (where it should have been already).

The clkops (clkops_omap3_core_dpll_ops & clkops_omap3_noncore_dpll_ops)
is used in clock data files, and dependency is already handled by
Makefile rule.

Signed-off-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 576d5e3a

arch/arm/mach-omap2/clock.c

+0 −18
Original line number Diff line number Diff line
@@ -398,24 +398,6 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent) 
	return omap2_clksel_set_parent(clk, new_parent);

}



/* OMAP3/4 non-CORE DPLL clkops */



#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)



const struct clkops clkops_omap3_noncore_dpll_ops = {

	.enable		= omap3_noncore_dpll_enable,

	.disable	= omap3_noncore_dpll_disable,

	.allow_idle	= omap3_dpll_allow_idle,

	.deny_idle	= omap3_dpll_deny_idle,

};



const struct clkops clkops_omap3_core_dpll_ops = {

	.allow_idle	= omap3_dpll_allow_idle,

	.deny_idle	= omap3_dpll_deny_idle,

};



#endif



/*

 * OMAP2+ clock reset and init functions

 */

arch/arm/mach-omap2/dpll3xxx.c

+14 −0
Original line number Diff line number Diff line
@@ -638,3 +638,17 @@ unsigned long omap3_clkoutx2_recalc(struct clk *clk) 
		rate = clk->parent->rate * 2;

	return rate;

}



/* OMAP3/4 non-CORE DPLL clkops */



const struct clkops clkops_omap3_noncore_dpll_ops = {

	.enable		= omap3_noncore_dpll_enable,

	.disable	= omap3_noncore_dpll_disable,

	.allow_idle	= omap3_dpll_allow_idle,

	.deny_idle	= omap3_dpll_deny_idle,

};



const struct clkops clkops_omap3_core_dpll_ops = {

	.allow_idle	= omap3_dpll_allow_idle,

	.deny_idle	= omap3_dpll_deny_idle,

};