diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-04-24 12:56:16 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-04-24 12:56:16 -0400 |
| commit | 535ff672e3589a38f60567314bc2ae15b9ab2604 (patch) | |
| tree | f0401090f244d06b6749e6b8f6cd0b94054dbf53 /arch/arm/mach-omap1 | |
| parent | 846c29f109fc27bd93817271689a752afc9168f8 (diff) | |
| parent | f248076c0dad45b7e50f27096e1aac6a617665db (diff) | |
Merge branch 'omap-clock-fixes' into omap-fixes
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/mcbsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c index d040c3f1027f..a2d7814896be 100644 --- a/arch/arm/mach-omap1/mcbsp.c +++ b/arch/arm/mach-omap1/mcbsp.c | |||
| @@ -40,8 +40,8 @@ static void omap1_mcbsp_request(unsigned int id) | |||
| 40 | */ | 40 | */ |
| 41 | if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) { | 41 | if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) { |
| 42 | if (dsp_use++ == 0) { | 42 | if (dsp_use++ == 0) { |
| 43 | api_clk = clk_get(NULL, "api_clk"); | 43 | api_clk = clk_get(NULL, "api_ck"); |
| 44 | dsp_clk = clk_get(NULL, "dsp_clk"); | 44 | dsp_clk = clk_get(NULL, "dsp_ck"); |
| 45 | if (!IS_ERR(api_clk) && !IS_ERR(dsp_clk)) { | 45 | if (!IS_ERR(api_clk) && !IS_ERR(dsp_clk)) { |
| 46 | clk_enable(api_clk); | 46 | clk_enable(api_clk); |
| 47 | clk_enable(dsp_clk); | 47 | clk_enable(dsp_clk); |