Commit 0a09dfa0 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: switch over to use snd_soc_register_component() on sh4 siu 



siu_dai.c is using snd_soc_register_dais(),
even though array size of siu_i2s_dai is 1.
OTOH, new API snd_soc_register_component() uses properly
snd_soc_register_dai()  (henceforth dai()) or
snd_soc_register_dais() (henceforth dais()) via num_dai.
Then, cpu_dai_name will be "siu-i2s-dai" if dais() was used,
and it will be "siu-pcm-audio" if dai() was used.
Therefore this patch fixup migor_dai :: cpu_dai_name too.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f53179c0

sound/soc/sh/migor.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int migor_dai_init(struct snd_soc_pcm_runtime *rtd) 
static struct snd_soc_dai_link migor_dai = {

	.name = "wm8978",

	.stream_name = "WM8978",

	.cpu_dai_name = "siu-i2s-dai",

	.cpu_dai_name = "siu-pcm-audio",

	.codec_dai_name = "wm8978-hifi",

	.platform_name = "siu-pcm-audio",

	.codec_name = "wm8978.0-001a",

sound/soc/sh/siu_dai.c

+8 −3
Original line number Diff line number Diff line
@@ -726,6 +726,10 @@ static struct snd_soc_dai_driver siu_i2s_dai = { 
	.ops = &siu_dai_ops,

};



static const struct snd_soc_component_driver siu_i2s_component = {

	.name		= "siu-i2s",

};



static int siu_probe(struct platform_device *pdev)

{

	const struct firmware *fw_entry;
@@ -783,7 +787,8 @@ static int siu_probe(struct platform_device *pdev) 
	dev_set_drvdata(&pdev->dev, info);



	/* register using ARRAY version so we can keep dai name */

	ret = snd_soc_register_dais(&pdev->dev, &siu_i2s_dai, 1);

	ret = snd_soc_register_component(&pdev->dev, &siu_i2s_component,

					 &siu_i2s_dai, 1);

	if (ret < 0)

		goto edaiinit;
@@ -796,7 +801,7 @@ static int siu_probe(struct platform_device *pdev) 
	return ret;



esocregp:

	snd_soc_unregister_dai(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);

edaiinit:

	iounmap(info->reg);

emapreg:
@@ -823,7 +828,7 @@ static int siu_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);



	snd_soc_unregister_platform(&pdev->dev);

	snd_soc_unregister_dai(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	iounmap(info->reg);

	iounmap(info->yram);

CRA Git | Maintained and supported by SUSTech CRA and CCSE