aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLiam Girdwood <lg@opensource.wolfsonmicro.com>2007-02-02 11:23:11 -0500
committerJaroslav Kysela <perex@suse.cz>2007-02-09 03:03:50 -0500
commitcb4c048b9306555ccbdb97eaf7922624664b0eb1 (patch)
treef916e7da900c8706661f1636501e5ec24c9c4b3d /sound
parent97952f601e939278df1194bac56b9755338ee7c1 (diff)
[ALSA] soc - ASoC 0.13 Sharp tosa machine
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/pxa/tosa.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 8c3c6b0534d6..5504e30acf14 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -40,6 +40,7 @@
40 40
41#include "../codecs/wm9712.h" 41#include "../codecs/wm9712.h"
42#include "pxa2xx-pcm.h" 42#include "pxa2xx-pcm.h"
43#include "pxa2xx-ac97.h"
43 44
44static struct snd_soc_machine tosa; 45static struct snd_soc_machine tosa;
45 46
@@ -228,12 +229,14 @@ static struct snd_soc_dai_link tosa_dai[] = {
228 .cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_HIFI], 229 .cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_HIFI],
229 .codec_dai = &wm9712_dai[WM9712_DAI_AC97_HIFI], 230 .codec_dai = &wm9712_dai[WM9712_DAI_AC97_HIFI],
230 .init = tosa_ac97_init, 231 .init = tosa_ac97_init,
232 .ops = &tosa_ops,
231}, 233},
232{ 234{
233 .name = "AC97 Aux", 235 .name = "AC97 Aux",
234 .stream_name = "AC97 Aux", 236 .stream_name = "AC97 Aux",
235 .cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_AUX], 237 .cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_AUX],
236 .codec_dai = &wm9712_dai[WM9712_DAI_AC97_AUX], 238 .codec_dai = &wm9712_dai[WM9712_DAI_AC97_AUX],
239 .ops = &tosa_ops,
237}, 240},
238}; 241};
239 242
@@ -241,7 +244,6 @@ static struct snd_soc_machine tosa = {
241 .name = "Tosa", 244 .name = "Tosa",
242 .dai_link = tosa_dai, 245 .dai_link = tosa_dai,
243 .num_links = ARRAY_SIZE(tosa_dai), 246 .num_links = ARRAY_SIZE(tosa_dai),
244 .ops = &tosa_ops,
245}; 247};
246 248
247static struct snd_soc_device tosa_snd_devdata = { 249static struct snd_soc_device tosa_snd_devdata = {