Fix AUDIO_MCBSP_DATAREAD/WRITE undefined for OMAP16xx

PATCH In review Dirk Behme 3 participants 3 messages Jan 17, 2006 – Jan 19, 2006

lore

Share & tools

lore

Dirk Behme

author

2006-01-17 18:44 UTC #0 lore raw

PATCH 1/1 Fix AUDIO_MCBSP_DATAREAD/WRITE undefined for OMAP16xx

ARM: OMAP: Define AUDIO_MCBSP_DATAREAD/WRITE for OMAP16xx as well

Fix error

sound/oss/omap-audio-dma-intfc.c:715: error: AUDIO_MCBSP_DATAWRITE' undeclared (first use in this function) sound/oss/omap-audio-dma-intfc.c:745: error: AUDIO_MCBSP_DATAREAD' undeclared (first use in this function)

Signed-off-by Dirk Behme <dirk.behme_at_de.bosch.com>

include/asm-arm/arch-omap/mcbsp.h renamed from include/asm-arm/arch-omap/mcbsp.h_orig +3 -0

@@ -80,6 +80,9 @@
 #define AUDIO_DMA_TX		OMAP_DMA_MCBSP1_TX
 #define AUDIO_DMA_RX		OMAP_DMA_MCBSP1_RX
 
+#define AUDIO_MCBSP_DATAWRITE	(0)
+#define AUDIO_MCBSP_DATAREAD	(0)
+
 #elif defined(CONFIG_ARCH_OMAP24XX)
 
 #define OMAP_MCBSP_REG_DRR2	0x00

lamikr

2006-01-17 19:21 UTC #1 lore raw

For this I think it would be better to take the patch from the message titled "omap1510/16xx fixes for the tsc2101 oss driver" I send yesterday. It defines the AUDIO_MCBSP_DATAWRITE and AUDIO_MCBSP_DATAREAD for the omap1510/16xx in a similar way than is done for the omap24xx.

Mika

Quoted 37 lines · Dirk Behme

ARM: OMAP: Define AUDIO_MCBSP_DATAREAD/WRITE for OMAP16xx as well
Fix error
sound/oss/omap-audio-dma-intfc.c:715: error: AUDIO_MCBSP_DATAWRITE' undeclared (first use in this function) sound/oss/omap-audio-dma-intfc.c:745: error: AUDIO_MCBSP_DATAREAD' undeclared (first use in this function)
Signed-off-by Dirk Behme <dirk.behme_at_de.bosch.com>
------------------------------------------------------------------------
include/asm-arm/arch-omap/mcbsp.h renamed from include/asm-arm/arch-omap/mcbsp.h_orig +3 -1
@@ -80,6 +80,9 @@
 #define AUDIO_DMA_TX		OMAP_DMA_MCBSP1_TX
 #define AUDIO_DMA_RX		OMAP_DMA_MCBSP1_RX
 
+#define AUDIO_MCBSP_DATAWRITE	(0)
+#define AUDIO_MCBSP_DATAREAD	(0)
+
 #elif defined(CONFIG_ARCH_OMAP24XX)
 
 #define OMAP_MCBSP_REG_DRR2	0x00
 
 
 
------------------------------------------------------------------------
_______________________________________________
Linux-omap-open-source mailing list
[email protected]
http://linux.omap.com/mailman/listinfo/linux-omap-open-source

Tony Lindgren

2006-01-19 20:05 UTC #2 lore raw

Quoted 29 lines · lamikr

For this I think it would be better to take the patch from the message titled "omap1510/16xx fixes for the tsc2101 oss driver" I send yesterday. It defines the AUDIO_MCBSP_DATAWRITE and AUDIO_MCBSP_DATAREAD for the omap1510/16xx in a similar way than is done for the omap24xx.
Mika
Quoted 20 lines · Dirk Behme
ARM: OMAP: Define AUDIO_MCBSP_DATAREAD/WRITE for OMAP16xx as well
Fix error
sound/oss/omap-audio-dma-intfc.c:715: error: AUDIO_MCBSP_DATAWRITE' undeclared (first use in this function) sound/oss/omap-audio-dma-intfc.c:745: error: AUDIO_MCBSP_DATAREAD' undeclared (first use in this function)
Signed-off-by Dirk Behme <dirk.behme_at_de.bosch.com>
------------------------------------------------------------------------
include/asm-arm/arch-omap/mcbsp.h renamed from include/asm-arm/arch-omap/mcbsp.h_orig +0 -0
@@ -80,6 +80,9 @@
 #define AUDIO_DMA_TX		OMAP_DMA_MCBSP1_TX
 #define AUDIO_DMA_RX		OMAP_DMA_MCBSP1_RX
 

Quoted 6 lines

include/asm-arm/arch-omap/mcbsp.h line 88
Quoted 6 lines
include/asm-arm/arch-omap/mcbsp.h renamed from include/asm-arm/arch-omap/mcbsp.h_orig +3 -0
+#define AUDIO_MCBSP_DATAWRITE	(0)
+#define AUDIO_MCBSP_DATAREAD	(0)
+
 #elif defined(CONFIG_ARCH_OMAP24XX)
 
 #define OMAP_MCBSP_REG_DRR2	0x00

I'll push Mika's patch at some point today as it also include this one.

Tony