From: David Brownell <david-b@pacbell.net>
Date: Wed, 23 May 2007 05:33:53 +0000 (-0700)
Subject: tsc2101-alsa build fixes
X-Git-Tag: v2.6.22-omap1~116
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=24c5d1ffc056621bd62a37ea14c48d5397c11212;p=linux-2.6-omap-h63xx.git

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 26fabfbb060..513614c7b6f 100644
--- 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 24b0cc6caf6..88ed04654f5 100644
--- 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 6cb2db3eacd..85dccbb8242 100644
--- 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)