From: Paul Walmsley Date: Thu, 2 Aug 2007 18:10:10 +0000 (-0600) Subject: omap2 clock: clean up dss2_fck clock flags X-Git-Tag: v2.6.23-omap1~259 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bbcba874011d3211f882c6c1d533d9552355fa85;p=linux-2.6-omap-h63xx.git omap2 clock: clean up dss2_fck clock flags dss2_fck is not a fixed-rate clock; its rate is dependent on its parent's rate. So, drop the .rate assignment and drop the RATE_FIXED clock flag. It also is a leaf clock - no clocks have it as a parent - so it can't propagate its rate anywhere. So, drop the RATE_PROPAGATES and fix the recalc function pointer accordingly. 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 733ab98a5dc..046c59b5cf5 100644 --- a/arch/arm/mach-omap2/clock.h +++ b/arch/arm/mach-omap2/clock.h @@ -1059,12 +1059,10 @@ static struct clk dss2_fck = { /* Alt clk used in power management */ static struct clk dss_54m_fck = { /* Alt clk used in power management */ .name = "dss_54m_fck", /* 54m tv clk */ .parent = &func_54m_ck, - .rate = 54000000, - .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | - RATE_FIXED | RATE_PROPAGATES, + .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), .enable_bit = OMAP24XX_EN_TV_SHIFT, - .recalc = &omap2_propagate_rate, + .recalc = &omap2_followparent_recalc, }; /*