hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: fsi: Add specified ID for soc-audio 

Specified ID is necessary, when some codecs are used with FSI.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Kuninori Morimoto 2010-07-16 19:51:06 +09:00 committed by Mark Brown
parent d947837410
commit 3c2ef841c0
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/sh_fsi.h
View File

@ -12,6 +12,9 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#define FSI_PORT_A 0
#define FSI_PORT_B 1
/* flags format /* flags format
* 0xABCDEEFF * 0xABCDEEFF

4
sound/soc/sh/fsi-ak4642.c
View File

@ -29,7 +29,7 @@ static int fsi_ak4642_dai_init(struct snd_soc_codec *codec)
static struct snd_soc_dai_link fsi_dai_link = { static struct snd_soc_dai_link fsi_dai_link = {
.name = "AK4642", .name = "AK4642",
.stream_name = "AK4642", .stream_name = "AK4642",
.cpu_dai = &fsi_soc_dai[0], /* fsi */ .cpu_dai = &fsi_soc_dai[FSI_PORT_A],
.codec_dai = &ak4642_dai, .codec_dai = &ak4642_dai,
.init = fsi_ak4642_dai_init, .init = fsi_ak4642_dai_init,
.ops = NULL, .ops = NULL,
@ -53,7 +53,7 @@ static int __init fsi_ak4642_init(void)
{ {
int ret = -ENOMEM; int ret = -ENOMEM;
fsi_snd_device = platform_device_alloc("soc-audio", -1); fsi_snd_device = platform_device_alloc("soc-audio", FSI_PORT_A);
if (!fsi_snd_device) if (!fsi_snd_device)
goto out; goto out;

4
sound/soc/sh/fsi-da7210.c
View File

@ -24,7 +24,7 @@ static int fsi_da7210_init(struct snd_soc_codec *codec)
static struct snd_soc_dai_link fsi_da7210_dai = { static struct snd_soc_dai_link fsi_da7210_dai = {
.name = "DA7210", .name = "DA7210",
.stream_name = "DA7210", .stream_name = "DA7210",
.cpu_dai = &fsi_soc_dai[1], /* FSI B */ .cpu_dai = &fsi_soc_dai[FSI_PORT_B],
.codec_dai = &da7210_dai, .codec_dai = &da7210_dai,
.init = fsi_da7210_init, .init = fsi_da7210_init,
}; };
@ -47,7 +47,7 @@ static int __init fsi_da7210_sound_init(void)
{ {
int ret; int ret;
fsi_da7210_snd_device = platform_device_alloc("soc-audio", -1); fsi_da7210_snd_device = platform_device_alloc("soc-audio", FSI_PORT_B);
if (!fsi_da7210_snd_device) if (!fsi_da7210_snd_device)
return -ENOMEM; return -ENOMEM;