From: Paul Walmsley Date: Thu, 2 Aug 2007 18:10:23 +0000 (-0600) Subject: omap2 clock: remove fixed rate from mdm_osc_ck X-Git-Tag: v2.6.23-omap1~246 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9b153fec0ef572c921b0bffb2a50b3114f12c294;p=linux-2.6-omap-h63xx.git omap2 clock: remove fixed rate from mdm_osc_ck mdm_osc_ck has a preinitialized rate and is marked as RATE_FIXED, but rather than using omap2_propagate_rate() as its recalc function, which accounts for RATE_FIXED clocks, it uses omap2_followparent_recalc(), which sets the rate to the parent clock's rate. After reviewing the 2430 TRM, fix this inconsistency by removing the fixed rate declarations (TRM says that this clock is 'typically' 26MHz). Signed-off-by: Paul Walmsley Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h index f4cd6a72df6..1c3d64754c3 100644 --- a/arch/arm/mach-omap2/clock.h +++ b/arch/arm/mach-omap2/clock.h @@ -960,6 +960,7 @@ static struct clk gfx_ick = { * CLOCKS: * MDM_OSC_CLK * MDM_ICLK + * These clocks are usable in chassis mode only. */ static struct clk mdm_ick = { /* used both as a ick and fck */ .name = "mdm_ick", @@ -974,9 +975,8 @@ static struct clk mdm_ick = { /* used both as a ick and fck */ static struct clk mdm_osc_ck = { .name = "mdm_osc_ck", - .rate = 26000000, .parent = &osc_ck, - .flags = CLOCK_IN_OMAP243X | RATE_FIXED, + .flags = CLOCK_IN_OMAP243X, .enable_reg = OMAP_CM_REGADDR(OMAP2430_MDM_MOD, OMAP24XX_CM_FCLKEN), .enable_bit = OMAP2430_EN_OSC_SHIFT, .recalc = &omap2_followparent_recalc,