]> err.no Git - linux-2.6/commitdiff
[ALSA] soc - ASoC 0.13 Sharp tosa machine
authorLiam Girdwood <lg@opensource.wolfsonmicro.com>
Fri, 2 Feb 2007 16:23:11 +0000 (17:23 +0100)
committerJaroslav Kysela <perex@suse.cz>
Fri, 9 Feb 2007 08:03:50 +0000 (09:03 +0100)
This patch updates the Sharp tosa machine driver to the new API in ASoC
0.13.
Changes:-
o  Update machine operations to new API.

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/pxa/tosa.c

index 8c3c6b0534d64d5db8f45b69032ba4330bda049e..5504e30acf145508df4434af8239c3414cac8a61 100644 (file)
@@ -40,6 +40,7 @@
 
 #include "../codecs/wm9712.h"
 #include "pxa2xx-pcm.h"
+#include "pxa2xx-ac97.h"
 
 static struct snd_soc_machine tosa;
 
@@ -228,12 +229,14 @@ static struct snd_soc_dai_link tosa_dai[] = {
        .cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_HIFI],
        .codec_dai = &wm9712_dai[WM9712_DAI_AC97_HIFI],
        .init = tosa_ac97_init,
+       .ops = &tosa_ops,
 },
 {
        .name = "AC97 Aux",
        .stream_name = "AC97 Aux",
        .cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_AUX],
        .codec_dai = &wm9712_dai[WM9712_DAI_AC97_AUX],
+       .ops = &tosa_ops,
 },
 };
 
@@ -241,7 +244,6 @@ static struct snd_soc_machine tosa = {
        .name = "Tosa",
        .dai_link = tosa_dai,
        .num_links = ARRAY_SIZE(tosa_dai),
-       .ops = &tosa_ops,
 };
 
 static struct snd_soc_device tosa_snd_devdata = {