Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into...
[openembedded.git] / recipes / linux / linux-omap2-git / beagleboard / mru-clocks1.diff
1 From: Mans Rullgard <mans@mansr.com>
2 Date: Tue, 22 Jul 2008 00:31:11 +0000 (+0100)
3 Subject: ARM: OMAP: make dpll4_m4_ck programmable with clk_set_rate()
4 X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=2b7b958dc79e51127d7a4ecf88ce12dbc6c31426
5
6 ARM: OMAP: make dpll4_m4_ck programmable with clk_set_rate()
7
8 Filling the set_rate and round_rate fields of dpll4_m4_ck makes
9 this clock programmable through clk_set_rate().  This is needed
10 to give omapfb control over the dss1_alwon_fck rate.
11 ---
12
13 diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
14 index 161da12..876eb13 100644
15 --- a/arch/arm/mach-omap2/clock34xx.h
16 +++ b/arch/arm/mach-omap2/clock34xx.h
17 @@ -815,6 +815,8 @@ static struct clk dpll4_m4_ck = {
18         .flags          = CLOCK_IN_OMAP343X | RATE_PROPAGATES |
19                                 PARENT_CONTROLS_CLOCK,
20         .recalc         = &omap2_clksel_recalc,
21 +       .set_rate       = &omap2_clksel_set_rate,
22 +       .round_rate     = &omap2_clksel_round_rate,
23  };
24  
25  /* The PWRDN bit is apparently only available on 3430ES2 and above */