tsc2101-alsa build fixes

Partial build fixes for tsc2101 audio.  It still won't link though,
it needs undefined omap_tsc2101_{read,write}() functions to access
chip registers ... and requires that e.g. tsc2102 audio isn't also
configured (they use the same exported McBSP DMA functions, which
likewise prevent use with EAC).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

diff --git a/sound/arm/omap/omap-alsa-tsc2101-mixer.h b/sound/arm/omap/omap-alsa-tsc2101-mixer.h
index 26fabfbb060308418d031290548596cfdd08f577..513614c7b6fdb3cdd000fdf985cc8df60e6a7b37 100644 (file)
--- a/sound/arm/omap/omap-alsa-tsc2101-mixer.h
+++ b/sound/arm/omap/omap-alsa-tsc2101-mixer.h
@@ -43,7 +43,6 @@
 #define OMAPALSATSC2101MIXER_H_
 
 #include <asm/hardware/tsc2101.h>
-#include <../drivers/ssi/omap-tsc2101.h>
 #include "omap-alsa-dma.h"
 
 /* tsc2101 DAC gain control volume specific  */

diff --git a/sound/arm/omap/omap-alsa-tsc2101.c b/sound/arm/omap/omap-alsa-tsc2101.c
index 24b0cc6caf6dad5ae74f6e745fe02893cc8f08c3..88ed04654f5c6097857b1759aaa633127df437c7 100644 (file)
--- a/sound/arm/omap/omap-alsa-tsc2101.c
+++ b/sound/arm/omap/omap-alsa-tsc2101.c
@@ -34,7 +34,6 @@
 #include <asm/arch/clock.h>
 
 #include <asm/hardware/tsc2101.h>
-#include <../drivers/ssi/omap-tsc2101.h>
 
 #include <asm/arch/omap-alsa.h>
 #include "omap-alsa-tsc2101.h"
@@ -118,7 +117,7 @@ static struct snd_pcm_hardware tsc2101_snd_omap_alsa_playback = {
        .fifo_size = 0,
 };
 
-static snd_pcm_hardware_t tsc2101_snd_omap_alsa_capture = {
+static struct snd_pcm_hardware tsc2101_snd_omap_alsa_capture = {
        .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
                 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
        .formats = (SNDRV_PCM_FMTBIT_S16_LE),

diff --git a/sound/arm/omap/omap-alsa-tsc2101.h b/sound/arm/omap/omap-alsa-tsc2101.h
index 6cb2db3eacd197889fc53029f8b3331caef4f433..85dccbb82429b8c0de4711eaf0c86efb2f416231 100644 (file)
--- a/sound/arm/omap/omap-alsa-tsc2101.h
+++ b/sound/arm/omap/omap-alsa-tsc2101.h
@@ -23,7 +23,7 @@
 
 #include <linux/types.h>
 
-/* Define to set the tsc as the master w.r.t McBSP */
+/* Define to set the tsc as the master w.r.t McBSP or EAC */
 #define TSC_MASTER
 
 #define NUMBER_SAMPLE_RATES_SUPPORTED  16
@@ -36,8 +36,9 @@
 #endif
 
 #define DEFAULT_SAMPLE_RATE            44100
-#define CODEC_CLOCK                    12000000
-#define AUDIO_MCBSP                    OMAP_MCBSP1
+
+/* FIXME codec clock rate is board-specific */
+#define CODEC_CLOCK                    12000000
 
 #define PAGE2_AUDIO_CODEC_REGISTERS    (2)