diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:00:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:00:53 -0700 |
commit | 1077682b2f97cee76a79cf38bab3fa022a97d9f8 (patch) | |
tree | e0e7dff35e3f38b9e360e702903e132c991f3f22 /arch/arm/plat-omap/mcbsp.c | |
parent | dc9ca2af4917ce4e545fa3eb1d845c555128cabc (diff) | |
parent | bafa49cc1b800df4748b29e2b038ff029d7c8747 (diff) | |
download | kernel_samsung_aries-1077682b2f97cee76a79cf38bab3fa022a97d9f8.zip kernel_samsung_aries-1077682b2f97cee76a79cf38bab3fa022a97d9f8.tar.gz kernel_samsung_aries-1077682b2f97cee76a79cf38bab3fa022a97d9f8.tar.bz2 |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/plat-omap/mcbsp.c')
-rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 43567d5..9c9b7df 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -27,6 +27,7 @@ #include <asm/arch/dma.h> #include <asm/arch/mux.h> #include <asm/arch/irqs.h> +#include <asm/arch/dsp_common.h> #include <asm/arch/mcbsp.h> #include <asm/hardware/clock.h> @@ -187,9 +188,6 @@ static int omap_mcbsp_check(unsigned int id) return -1; } -#define EN_XORPCK 1 -#define DSP_RSTCT2 0xe1008014 - static void omap_mcbsp_dsp_request(void) { if (cpu_is_omap1510() || cpu_is_omap16xx()) { @@ -198,6 +196,11 @@ static void omap_mcbsp_dsp_request(void) /* enable 12MHz clock to mcbsp 1 & 3 */ clk_use(mcbsp_dspxor_ck); + + /* + * DSP external peripheral reset + * FIXME: This should be moved to dsp code + */ __raw_writew(__raw_readw(DSP_RSTCT2) | 1 | 1 << 1, DSP_RSTCT2); } |