diff options
author | Paul Walmsley <paul@pwsan.com> | 2010-01-19 17:30:55 -0700 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-01-20 13:35:28 -0700 |
commit | af022fafa89cca5731da3e3325dc027ed8d57bcd (patch) | |
tree | b902855a35129aa2731d7233d50838e207b111e8 /arch/arm/mach-omap1 | |
parent | ecbb06594744b72c362cb2252cb5f6de7cf1b394 (diff) | |
download | kernel_samsung_tuna-af022fafa89cca5731da3e3325dc027ed8d57bcd.zip kernel_samsung_tuna-af022fafa89cca5731da3e3325dc027ed8d57bcd.tar.gz kernel_samsung_tuna-af022fafa89cca5731da3e3325dc027ed8d57bcd.tar.bz2 |
OMAP1 clock: fix for "BUG: spinlock lockup on CPU#0"
Commit 52650505fbf3a6ab851c801f54e73e76c55ab8da caused clock initialization
to fail on OMAP1 with "BUG: spinlock lockup on CPU#0" -- this is because
omap1_select_table_rate() and omap1_round_to_table_rate() call clk_get_rate()
with the clockfw spinlock held. Fix by accessing the rate directly from
the internal clock framework functions.
Thanks to Tony Lindgren <tony@atomide.com> for reporting and testing the fix.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/clock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 2ba9ab9..04f1d29 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -214,8 +214,8 @@ int omap1_select_table_rate(struct clk *clk, unsigned long rate) struct mpu_rate * ptr; unsigned long dpll1_rate, ref_rate; - dpll1_rate = clk_get_rate(ck_dpll1_p); - ref_rate = clk_get_rate(ck_ref_p); + dpll1_rate = ck_dpll1_p->rate; + ref_rate = ck_ref_p->rate; for (ptr = omap1_rate_table; ptr->rate; ptr++) { if (ptr->xtal != ref_rate) @@ -306,7 +306,7 @@ long omap1_round_to_table_rate(struct clk *clk, unsigned long rate) long highest_rate; unsigned long ref_rate; - ref_rate = clk_get_rate(ck_ref_p); + ref_rate = ck_ref_p->rate; highest_rate = -EINVAL; |