Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb4c048b authored by Liam Girdwood's avatar Liam Girdwood Committed by Jaroslav Kysela
Browse files

[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: default avatarLiam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 97952f60

sound/soc/pxa/tosa.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ 




#include "../codecs/wm9712.h"

#include "../codecs/wm9712.h"

#include "pxa2xx-pcm.h"

#include "pxa2xx-pcm.h"

#include "pxa2xx-ac97.h"





static struct snd_soc_machine tosa;

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],

	.cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_HIFI],

	.codec_dai = &wm9712_dai[WM9712_DAI_AC97_HIFI],

	.codec_dai = &wm9712_dai[WM9712_DAI_AC97_HIFI],

	.init = tosa_ac97_init,

	.init = tosa_ac97_init,

	.ops = &tosa_ops,

},

},

{

{

	.name = "AC97 Aux",

	.name = "AC97 Aux",

	.stream_name = "AC97 Aux",

	.stream_name = "AC97 Aux",

	.cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_AUX],

	.cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_AUX],

	.codec_dai = &wm9712_dai[WM9712_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",

	.name = "Tosa",

	.dai_link = tosa_dai,

	.dai_link = tosa_dai,

	.num_links = ARRAY_SIZE(tosa_dai),

	.num_links = ARRAY_SIZE(tosa_dai),

	.ops = &tosa_ops,

};

};





static struct snd_soc_device tosa_snd_devdata = {

static struct snd_soc_device tosa_snd_devdata = {