diff options
Diffstat (limited to 'arch/arm/mach-omap2/clkt2xxx_osc.c')
| -rw-r--r-- | arch/arm/mach-omap2/clkt2xxx_osc.c | 13 | 
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/clkt2xxx_osc.c b/arch/arm/mach-omap2/clkt2xxx_osc.c index e1777371bb5..19f54d43349 100644 --- a/arch/arm/mach-omap2/clkt2xxx_osc.c +++ b/arch/arm/mach-omap2/clkt2xxx_osc.c @@ -35,7 +35,7 @@   * clk_enable/clk_disable()-based usecounting for osc_ck should be   * replaced with autoidle-based usecounting.   */ -static int omap2_enable_osc_ck(struct clk *clk) +int omap2_enable_osc_ck(struct clk_hw *clk)  {  	u32 pcc; @@ -53,7 +53,7 @@ static int omap2_enable_osc_ck(struct clk *clk)   * clk_enable/clk_disable()-based usecounting for osc_ck should be   * replaced with autoidle-based usecounting.   */ -static void omap2_disable_osc_ck(struct clk *clk) +void omap2_disable_osc_ck(struct clk_hw *clk)  {  	u32 pcc; @@ -62,13 +62,8 @@ static void omap2_disable_osc_ck(struct clk *clk)  	__raw_writel(pcc | OMAP_AUTOEXTCLKMODE_MASK, prcm_clksrc_ctrl);  } -const struct clkops clkops_oscck = { -	.enable		= omap2_enable_osc_ck, -	.disable	= omap2_disable_osc_ck, -}; - -unsigned long omap2_osc_clk_recalc(struct clk *clk) +unsigned long omap2_osc_clk_recalc(struct clk_hw *clk, +				   unsigned long parent_rate)  {  	return omap2xxx_get_apll_clkin() * omap2xxx_get_sysclkdiv();  } -  |