aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/plat/mcbsp.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-12 15:26:48 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 12:27:02 -0500
commita8eb7ca0cbb41c9cd379b8d2a2a5efb503aa65e9 (patch)
tree86901095aeb9e59815a6f95547cf68a9ec0b32e0 /arch/arm/plat-omap/include/plat/mcbsp.h
parent088ef950dc0dd58d2f339e1616c9092fea923f06 (diff)
omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3
Replace ARCH_OMAP34XX with ARCH_OMAP3 Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/include/plat/mcbsp.h')
-rw-r--r--arch/arm/plat-omap/include/plat/mcbsp.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index 951506277ec8..0d7e536a3c95 100644
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -103,7 +103,7 @@
103#define AUDIO_DMA_TX OMAP_DMA_MCBSP1_TX 103#define AUDIO_DMA_TX OMAP_DMA_MCBSP1_TX
104#define AUDIO_DMA_RX OMAP_DMA_MCBSP1_RX 104#define AUDIO_DMA_RX OMAP_DMA_MCBSP1_RX
105 105
106#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ 106#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
107 defined(CONFIG_ARCH_OMAP4) 107 defined(CONFIG_ARCH_OMAP4)
108 108
109#define OMAP_MCBSP_REG_DRR2 0x00 109#define OMAP_MCBSP_REG_DRR2 0x00
@@ -374,7 +374,7 @@ struct omap_mcbsp_platform_data {
374 u8 dma_rx_sync, dma_tx_sync; 374 u8 dma_rx_sync, dma_tx_sync;
375 u16 rx_irq, tx_irq; 375 u16 rx_irq, tx_irq;
376 struct omap_mcbsp_ops *ops; 376 struct omap_mcbsp_ops *ops;
377#ifdef CONFIG_ARCH_OMAP34XX 377#ifdef CONFIG_ARCH_OMAP3
378 u16 buffer_size; 378 u16 buffer_size;
379#endif 379#endif
380}; 380};
@@ -410,7 +410,7 @@ struct omap_mcbsp {
410 struct omap_mcbsp_platform_data *pdata; 410 struct omap_mcbsp_platform_data *pdata;
411 struct clk *iclk; 411 struct clk *iclk;
412 struct clk *fclk; 412 struct clk *fclk;
413#ifdef CONFIG_ARCH_OMAP34XX 413#ifdef CONFIG_ARCH_OMAP3
414 int dma_op_mode; 414 int dma_op_mode;
415 u16 max_tx_thres; 415 u16 max_tx_thres;
416 u16 max_rx_thres; 416 u16 max_rx_thres;
@@ -423,7 +423,7 @@ int omap_mcbsp_init(void);
423void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, 423void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
424 int size); 424 int size);
425void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config); 425void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config);
426#ifdef CONFIG_ARCH_OMAP34XX 426#ifdef CONFIG_ARCH_OMAP3
427void omap_mcbsp_set_tx_threshold(unsigned int id, u16 threshold); 427void omap_mcbsp_set_tx_threshold(unsigned int id, u16 threshold);
428void omap_mcbsp_set_rx_threshold(unsigned int id, u16 threshold); 428void omap_mcbsp_set_rx_threshold(unsigned int id, u16 threshold);
429u16 omap_mcbsp_get_max_tx_threshold(unsigned int id); 429u16 omap_mcbsp_get_max_tx_threshold(unsigned int id);