diff options
Diffstat (limited to 'meta/recipes-kernel/linux/linux-omap2-git/beagleboard/mru-clocks2.diff')
-rw-r--r-- | meta/recipes-kernel/linux/linux-omap2-git/beagleboard/mru-clocks2.diff | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/mru-clocks2.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/mru-clocks2.diff new file mode 100644 index 0000000000..c8b370da03 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/mru-clocks2.diff | |||
@@ -0,0 +1,62 @@ | |||
1 | From: Mans Rullgard <mans@mansr.com> | ||
2 | Date: Tue, 22 Jul 2008 00:58:18 +0000 (+0100) | ||
3 | Subject: ARM: OMAP: add clk_get_parent() for OMAP2/3 | ||
4 | X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=e2de5e5578fbaa9b4b75074796da0608fc93e6ae | ||
5 | |||
6 | ARM: OMAP: add clk_get_parent() for OMAP2/3 | ||
7 | |||
8 | Signed-off-by: Mans Rullgard <mans@mansr.com> | ||
9 | --- | ||
10 | |||
11 | diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c | ||
12 | index 577be44..28aec36 100644 | ||
13 | --- a/arch/arm/mach-omap2/clock.c | ||
14 | +++ b/arch/arm/mach-omap2/clock.c | ||
15 | @@ -824,6 +824,11 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent) | ||
16 | return 0; | ||
17 | } | ||
18 | |||
19 | +struct clk *omap2_clk_get_parent(struct clk *clk) | ||
20 | +{ | ||
21 | + return clk->parent; | ||
22 | +} | ||
23 | + | ||
24 | /* DPLL rate rounding code */ | ||
25 | |||
26 | /** | ||
27 | diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h | ||
28 | index 49245f7..4aa69d5 100644 | ||
29 | --- a/arch/arm/mach-omap2/clock.h | ||
30 | +++ b/arch/arm/mach-omap2/clock.h | ||
31 | @@ -29,6 +29,7 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate); | ||
32 | int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent); | ||
33 | int omap2_dpll_set_rate_tolerance(struct clk *clk, unsigned int tolerance); | ||
34 | long omap2_dpll_round_rate(struct clk *clk, unsigned long target_rate); | ||
35 | +struct clk *omap2_clk_get_parent(struct clk *clk); | ||
36 | |||
37 | #ifdef CONFIG_OMAP_RESET_CLOCKS | ||
38 | void omap2_clk_disable_unused(struct clk *clk); | ||
39 | diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c | ||
40 | index 54cc6e1..ed7af21 100644 | ||
41 | --- a/arch/arm/mach-omap2/clock24xx.c | ||
42 | +++ b/arch/arm/mach-omap2/clock24xx.c | ||
43 | @@ -422,6 +422,7 @@ static struct clk_functions omap2_clk_functions = { | ||
44 | .clk_round_rate = omap2_clk_round_rate, | ||
45 | .clk_set_rate = omap2_clk_set_rate, | ||
46 | .clk_set_parent = omap2_clk_set_parent, | ||
47 | + .clk_get_parent = omap2_clk_get_parent, | ||
48 | .clk_disable_unused = omap2_clk_disable_unused, | ||
49 | #ifdef CONFIG_CPU_FREQ | ||
50 | .clk_init_cpufreq_table = omap2_clk_init_cpufreq_table, | ||
51 | diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c | ||
52 | index 04dedec..08c8c46 100644 | ||
53 | --- a/arch/arm/mach-omap2/clock34xx.c | ||
54 | +++ b/arch/arm/mach-omap2/clock34xx.c | ||
55 | @@ -541,6 +541,7 @@ static struct clk_functions omap2_clk_functions = { | ||
56 | .clk_round_rate = omap2_clk_round_rate, | ||
57 | .clk_set_rate = omap2_clk_set_rate, | ||
58 | .clk_set_parent = omap2_clk_set_parent, | ||
59 | + .clk_get_parent = omap2_clk_get_parent, | ||
60 | .clk_disable_unused = omap2_clk_disable_unused, | ||
61 | }; | ||
62 | |||