diff options
author | Tony Lindgren <tony@atomide.com> | 2007-11-29 18:38:16 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-02-08 13:37:57 -0500 |
commit | 1cccd2a728673da00a05fe19c5ba4897257d6b8a (patch) | |
tree | af517aac0c76d0ba75e9541c891f27b28919f146 | |
parent | a4ffc0a0b240a29cbe489f6db9dae112a49ef1c1 (diff) |
ARM: OMAP: Request DSP memory for McBSP
On OMAP1 some McBSP features depend on DSP. Also export
polling functions as suggested by Luis Cargnini.
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 2af5bd5a1344..9cf83c4da9fa 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c | |||
@@ -201,6 +201,14 @@ static int omap_mcbsp_check(unsigned int id) | |||
201 | static void omap_mcbsp_dsp_request(void) | 201 | static void omap_mcbsp_dsp_request(void) |
202 | { | 202 | { |
203 | if (cpu_is_omap15xx() || cpu_is_omap16xx()) { | 203 | if (cpu_is_omap15xx() || cpu_is_omap16xx()) { |
204 | int ret; | ||
205 | |||
206 | ret = omap_dsp_request_mem(); | ||
207 | if (ret < 0) { | ||
208 | printk(KERN_ERR "Could not get dsp memory: %i\n", ret); | ||
209 | return; | ||
210 | } | ||
211 | |||
204 | clk_enable(mcbsp_dsp_ck); | 212 | clk_enable(mcbsp_dsp_ck); |
205 | clk_enable(mcbsp_api_ck); | 213 | clk_enable(mcbsp_api_ck); |
206 | 214 | ||
@@ -219,6 +227,7 @@ static void omap_mcbsp_dsp_request(void) | |||
219 | static void omap_mcbsp_dsp_free(void) | 227 | static void omap_mcbsp_dsp_free(void) |
220 | { | 228 | { |
221 | if (cpu_is_omap15xx() || cpu_is_omap16xx()) { | 229 | if (cpu_is_omap15xx() || cpu_is_omap16xx()) { |
230 | omap_dsp_release_mem(); | ||
222 | clk_disable(mcbsp_dspxor_ck); | 231 | clk_disable(mcbsp_dspxor_ck); |
223 | clk_disable(mcbsp_dsp_ck); | 232 | clk_disable(mcbsp_dsp_ck); |
224 | clk_disable(mcbsp_api_ck); | 233 | clk_disable(mcbsp_api_ck); |
@@ -1024,6 +1033,8 @@ EXPORT_SYMBOL(omap_mcbsp_set_io_type); | |||
1024 | EXPORT_SYMBOL(omap_mcbsp_free); | 1033 | EXPORT_SYMBOL(omap_mcbsp_free); |
1025 | EXPORT_SYMBOL(omap_mcbsp_start); | 1034 | EXPORT_SYMBOL(omap_mcbsp_start); |
1026 | EXPORT_SYMBOL(omap_mcbsp_stop); | 1035 | EXPORT_SYMBOL(omap_mcbsp_stop); |
1036 | EXPORT_SYMBOL(omap_mcbsp_pollread); | ||
1037 | EXPORT_SYMBOL(omap_mcbsp_pollwrite); | ||
1027 | EXPORT_SYMBOL(omap_mcbsp_xmit_word); | 1038 | EXPORT_SYMBOL(omap_mcbsp_xmit_word); |
1028 | EXPORT_SYMBOL(omap_mcbsp_recv_word); | 1039 | EXPORT_SYMBOL(omap_mcbsp_recv_word); |
1029 | EXPORT_SYMBOL(omap_mcbsp_xmit_buffer); | 1040 | EXPORT_SYMBOL(omap_mcbsp_xmit_buffer); |