diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 03:05:22 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 03:05:22 -0500 |
| commit | fb7899b1f0b748ef966071f5dc23c59ebd57d08f (patch) | |
| tree | 2f13f9d8607871a60334608524e8b4e9447f5309 /arch/arm/mach-omap1/clock.c | |
| parent | 212b3c8b8ab94d983c2e0ee1821f17dd5b4e0859 (diff) | |
| parent | abe94c756c08d50566c09a65b9c7fe72f83071c5 (diff) | |
Merge commit 'v2.6.33-rc6' into secretlab/next-spi
Diffstat (limited to 'arch/arm/mach-omap1/clock.c')
| -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 2ba9ab953731..04f1d29cba2c 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) | |||
| 214 | struct mpu_rate * ptr; | 214 | struct mpu_rate * ptr; |
| 215 | unsigned long dpll1_rate, ref_rate; | 215 | unsigned long dpll1_rate, ref_rate; |
| 216 | 216 | ||
| 217 | dpll1_rate = clk_get_rate(ck_dpll1_p); | 217 | dpll1_rate = ck_dpll1_p->rate; |
| 218 | ref_rate = clk_get_rate(ck_ref_p); | 218 | ref_rate = ck_ref_p->rate; |
| 219 | 219 | ||
| 220 | for (ptr = omap1_rate_table; ptr->rate; ptr++) { | 220 | for (ptr = omap1_rate_table; ptr->rate; ptr++) { |
| 221 | if (ptr->xtal != ref_rate) | 221 | if (ptr->xtal != ref_rate) |
| @@ -306,7 +306,7 @@ long omap1_round_to_table_rate(struct clk *clk, unsigned long rate) | |||
| 306 | long highest_rate; | 306 | long highest_rate; |
| 307 | unsigned long ref_rate; | 307 | unsigned long ref_rate; |
| 308 | 308 | ||
| 309 | ref_rate = clk_get_rate(ck_ref_p); | 309 | ref_rate = ck_ref_p->rate; |
| 310 | 310 | ||
| 311 | highest_rate = -EINVAL; | 311 | highest_rate = -EINVAL; |
| 312 | 312 | ||