summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorHögander Jouni <jouni.hogander@nokia.com>2008-04-23 16:12:19 +0300
committerTony Lindgren <tony@atomide.com>2008-05-09 10:25:04 -0700
commitd756f54e57a261db39c46f1853b71be85608b15f (patch)
treef78e6ae44a6c845ffcb82578cf4aee9d49f1ed03 /arch/arm
parent1971a3900a4fd61643de950248309598c3e23215 (diff)
downloadlwn-d756f54e57a261db39c46f1853b71be85608b15f.tar.gz
lwn-d756f54e57a261db39c46f1853b71be85608b15f.zip
ARM: OMAP: Add PARENT_CONTROLS_CLOCK flag to dpll5_m2_ck
This patch removes following message on dpll5_m2_ck enable and disable: clock.c: Enable for dpll5_m2_ck without enable code clock: clk_disable called on independent clock dpll5_m2_ck which has no enable_reg Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com> Acked-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/clock34xx.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
index f8bdcc1e3d3c..c9c5972a2e25 100644
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
@@ -836,7 +836,8 @@ static struct clk dpll5_m2_ck = {
.clksel_reg = OMAP_CM_REGADDR(PLL_MOD, OMAP3430ES2_CM_CLKSEL5),
.clksel_mask = OMAP3430ES2_DIV_120M_MASK,
.clksel = div16_dpll5_clksel,
- .flags = CLOCK_IN_OMAP3430ES2 | RATE_PROPAGATES,
+ .flags = CLOCK_IN_OMAP3430ES2 | RATE_PROPAGATES |
+ PARENT_CONTROLS_CLOCK,
.recalc = &omap2_clksel_recalc,
};