]> err.no Git - linux-2.6/commitdiff
[ALSA] ASoC AT91xxxx eti B1 machine SSC changes
authorFrank Mandarino <fmandarino@endrelia.com>
Mon, 16 Apr 2007 15:19:42 +0000 (17:19 +0200)
committerJaroslav Kysela <perex@suse.cz>
Fri, 11 May 2007 14:56:01 +0000 (16:56 +0200)
This patch by Frank Madarino updates the eti B1 machine to use the newer
AT91xxxx SSC core with the DSP/PCM audio hardware changes.
Changes:-
 o #include 'at91-ssc.h' instead of 'at91-i2s.h'
 o Rename various I2S labels to SSC

Signed-off-by: Frank Mandarino <fmandarino@endrelia.com>
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
sound/soc/at91/eti_b1_wm8731.c

index 8179df3bb2f33cd3a833228ad827d7ece6460a7e..820a676c56bf66e8a0b5ae34023f48646b59d1fd 100644 (file)
@@ -40,7 +40,7 @@
 
 #include "../codecs/wm8731.h"
 #include "at91-pcm.h"
-#include "at91-i2s.h"
+#include "at91-ssc.h"
 
 #if 0
 #define        DBG(x...)       printk(KERN_INFO "eti_b1_wm8731: " x)
@@ -248,15 +248,15 @@ static int eti_b1_wm8731_init(struct snd_soc_codec *codec)
 
 static struct snd_soc_dai_link eti_b1_dai = {
        .name = "WM8731",
-       .stream_name = "WM8731",
-       .cpu_dai = &at91_i2s_dai[1],
+       .stream_name = "WM8731 PCM",
+       .cpu_dai = &at91_ssc_dai[1],
        .codec_dai = &wm8731_dai,
        .init = eti_b1_wm8731_init,
        .ops = &eti_b1_ops,
 };
 
 static struct snd_soc_machine snd_soc_machine_eti_b1 = {
-       .name = "ETI_B1",
+       .name = "ETI_B1_WM8731",
        .dai_link = &eti_b1_dai,
        .num_links = 1,
 };