diff options
author | Frank Mandarino <fmandarino@endrelia.com> | 2007-04-16 11:19:42 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 10:56:01 -0400 |
commit | eb831da553d1526b9acd5ee4cd83ff52ae446c5f (patch) | |
tree | 745fca42598afd847fbb9b1320ead30c04cee920 /sound/soc/at91 | |
parent | 36b8a8bbb402911e59acf13b5074eb8915e47a6a (diff) |
[ALSA] ASoC AT91xxxx eti B1 machine SSC changes
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>
Diffstat (limited to 'sound/soc/at91')
-rw-r--r-- | sound/soc/at91/eti_b1_wm8731.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/at91/eti_b1_wm8731.c b/sound/soc/at91/eti_b1_wm8731.c index 8179df3bb2f3..820a676c56bf 100644 --- a/sound/soc/at91/eti_b1_wm8731.c +++ b/sound/soc/at91/eti_b1_wm8731.c | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | #include "../codecs/wm8731.h" | 41 | #include "../codecs/wm8731.h" |
42 | #include "at91-pcm.h" | 42 | #include "at91-pcm.h" |
43 | #include "at91-i2s.h" | 43 | #include "at91-ssc.h" |
44 | 44 | ||
45 | #if 0 | 45 | #if 0 |
46 | #define DBG(x...) printk(KERN_INFO "eti_b1_wm8731: " x) | 46 | #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) | |||
248 | 248 | ||
249 | static struct snd_soc_dai_link eti_b1_dai = { | 249 | static struct snd_soc_dai_link eti_b1_dai = { |
250 | .name = "WM8731", | 250 | .name = "WM8731", |
251 | .stream_name = "WM8731", | 251 | .stream_name = "WM8731 PCM", |
252 | .cpu_dai = &at91_i2s_dai[1], | 252 | .cpu_dai = &at91_ssc_dai[1], |
253 | .codec_dai = &wm8731_dai, | 253 | .codec_dai = &wm8731_dai, |
254 | .init = eti_b1_wm8731_init, | 254 | .init = eti_b1_wm8731_init, |
255 | .ops = &eti_b1_ops, | 255 | .ops = &eti_b1_ops, |
256 | }; | 256 | }; |
257 | 257 | ||
258 | static struct snd_soc_machine snd_soc_machine_eti_b1 = { | 258 | static struct snd_soc_machine snd_soc_machine_eti_b1 = { |
259 | .name = "ETI_B1", | 259 | .name = "ETI_B1_WM8731", |
260 | .dai_link = &eti_b1_dai, | 260 | .dai_link = &eti_b1_dai, |
261 | .num_links = 1, | 261 | .num_links = 1, |
262 | }; | 262 | }; |