Comments: This patch adds defines needed by audio driver.
Signed-off-by: Chandra Shekhar <x0044955@xxxxxx>
---
arch/arm/plat-omap/mcbsp.c | 7 +++++++
include/asm-arm/arch-omap/mcbsp.h | 16 ++++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
diff -purN linux-omap-git/arch/arm/plat-omap/mcbsp.c linux-omap-git.new/arch/arm/plat-omap/mcbsp.c
--- linux-omap-git/arch/arm/plat-omap/mcbsp.c 2007-12-13 00:13:12.000000000 -0600
+++ linux-omap-git.new/arch/arm/plat-omap/mcbsp.c 2007-12-19 18:32:59.000000000 -0600
@@ -38,6 +38,7 @@
#define DBG(x...) do { } while (0)
#endif
+
struct omap_mcbsp {
u32 io_base;
u8 id;
@@ -112,6 +113,12 @@ static struct omap_mcbsp_clocks {
struct clk *ick;
struct clk *fck;
} omap_mcbsp_clk[OMAP_MAX_MCBSP_COUNT];
+
+static int omap_mcbsp_max_dmachs_rx[OMAP_MAX_MCBSP_COUNT] = {2, 2, 2, 2, 2};
+static int omap_mcbsp_max_dmachs_tx[OMAP_MAX_MCBSP_COUNT] = {2, 2, 2, 2, 2};
+#define OMAP_MCBSP_MAX_MULTI_CHS 127
+static u32 omap_get_mcbspid[OMAP_MCBSP_MAX_MULTI_CHS] = {0};
+
#endif
static void omap_mcbsp_dump_reg(u8 id)
diff -purN linux-omap-git/include/asm-arm/arch-omap/mcbsp.h linux-omap-git.new/include/asm-arm/arch-omap/mcbsp.h
--- linux-omap-git/include/asm-arm/arch-omap/mcbsp.h 2007-12-10 13:13:50.000000000 -0600
+++ linux-omap-git.new/include/asm-arm/arch-omap/mcbsp.h 2007-12-19 18:32:32.000000000 -0600
@@ -156,6 +156,8 @@
#define OMAP_MCBSP_REG_XBUFFSTAT 0xB4
#define OMAP_MCBSP_REG_RBUFFSTAT 0xB8
+#define AUDIO_MCBSP OMAP_MCBSP2
+
#define OMAP_MAX_MCBSP_COUNT 5
#endif
@@ -347,6 +349,10 @@ typedef void (*omap_mcbsp_dma_cb) (u32 c
#define OMAP_MCBSP_RJUST_SIGNMSB 1
#define OMAP_MCBSP_LJUST_ZEROLSB 2
+#define OMAP_MCBSP_DATADELAY0 0
+#define OMAP_MCBSP_DATADELAY1 1
+#define OMAP_MCBSP_DATADELAY2 2
+
#define OMAP_MCBSP_AUTO_RST_NONE (0x0)
#define OMAP_MCBSP_AUTO_RRST (0x1<<1)
#define OMAP_MCBSP_AUTO_XRST (0x1<<2)
@@ -355,6 +361,8 @@ typedef void (*omap_mcbsp_dma_cb) (u32 c
#define OMAP_MCBSP_MSBFIRST 0
#define OMAP_MCBSP_LSBFIRST 1
+#define OMAP_MCBSP_FRAMELEN_N(NUM_WORDS) ((NUM_WORDS - 1) & 0x7F)
+
/* we don't do multichannel for now */
struct omap_mcbsp_reg_cfg {
u32 spcr2;
@@ -475,14 +483,6 @@ struct omap_mcbsp_spi_cfg {
omap_mcbsp_clk_stp_mode clk_stp_mode;
omap_mcbsp_word_length word_length;
};
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX)
-static int omap_mcbsp_max_dmachs_rx[OMAP_MAX_MCBSP_COUNT] = {2, 2, 2, 2, 2};
-static int omap_mcbsp_max_dmachs_tx[OMAP_MAX_MCBSP_COUNT] = {2, 2, 2, 2, 2};
-
-#define OMAP_MCBSP_MAX_MULTI_CHS 127
-
-u32 omap_get_mcbspid[OMAP_MCBSP_MAX_MULTI_CHS] = {0};
-#endif
void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config);
int omap_mcbsp_request(unsigned int id);
-
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
