From: Seth Forshee Date: Fri, 25 Apr 2008 01:56:56 +0000 (-0500) Subject: ARM: OMAP2: Set PRCM_CLKSRC_CTRL correctly in omap2_enable_osc_ck X-Git-Tag: v2.6.26-omap1~123^2~168 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=00727e296759e20c7fe524b3f288c6adbcb00da5;p=linux-2.6-omap-h63xx.git ARM: OMAP2: Set PRCM_CLKSRC_CTRL correctly in omap2_enable_osc_ck This patch fixes an incorrect use of prm_rmw_reg_bits() in omap2_enable_osc_ck() which is changing bits in PRCM_CLKSRC_CTRL that are unrelated to the function it is performing. Signed-off-by: Seth Forshee Acked-by: Paul Walmsley Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index 9b7fd15a7b6..e7968e72e84 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c @@ -78,7 +78,7 @@ static u32 omap2_get_dpll_rate_24xx(struct clk *tclk) static int omap2_enable_osc_ck(struct clk *clk) { - prm_rmw_reg_bits(OMAP_AUTOEXTCLKMODE_MASK, ~OMAP_AUTOEXTCLKMODE_MASK, + prm_rmw_reg_bits(OMAP_AUTOEXTCLKMODE_MASK, 0, OMAP24XX_PRCM_CLKSRC_CTRL); return 0;