summaryrefslogtreecommitdiffstats
path: root/sound/soc/at91
diff options
context:
space:
mode:
authorFrank Mandarino2007-04-16 17:19:42 +0200
committerJaroslav Kysela2007-05-11 16:56:01 +0200
commiteb831da553d1526b9acd5ee4cd83ff52ae446c5f (patch)
tree745fca42598afd847fbb9b1320ead30c04cee920 /sound/soc/at91
parent[ALSA] ASoC AT91xxxx - SSC port DSP support (diff)
downloadkernel-qcow2-linux-eb831da553d1526b9acd5ee4cd83ff52ae446c5f.tar.gz
kernel-qcow2-linux-eb831da553d1526b9acd5ee4cd83ff52ae446c5f.tar.xz
kernel-qcow2-linux-eb831da553d1526b9acd5ee4cd83ff52ae446c5f.zip
[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.c8
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 @@
#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,
};