Unverified Commit 3cddda10 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: samsung: odroid: use modern dai_link style 



ASoC is now supporting modern style dai_link
(= snd_soc_dai_link_component) for CPU/Codec/Platform.
This patch switches to use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 400127a1

sound/soc/samsung/odroid.c

+19 −10
Original line number Diff line number Diff line
@@ -151,39 +151,48 @@ static const struct snd_soc_dapm_route odroid_dapm_routes[] = { 
	{ "HiFi Playback", NULL, "Mixer DAI TX" },

};



SND_SOC_DAILINK_DEFS(primary,

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_DUMMY()),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("3830000.i2s")));



SND_SOC_DAILINK_DEFS(mixer,

	DAILINK_COMP_ARRAY(COMP_DUMMY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_DUMMY()));



SND_SOC_DAILINK_DEFS(secondary,

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_DUMMY()),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("3830000.i2s-sec")));



static struct snd_soc_dai_link odroid_card_dais[] = {

	{

		/* Primary FE <-> BE link */

		.codec_name = "snd-soc-dummy",

		.codec_dai_name = "snd-soc-dummy-dai",

		.ops = &odroid_card_fe_ops,

		.name = "Primary",

		.stream_name = "Primary",

		.platform_name = "3830000.i2s",

		.dynamic = 1,

		.dpcm_playback = 1,

		SND_SOC_DAILINK_REG(primary),

	}, {

		/* BE <-> CODECs link */

		.name = "I2S Mixer",

		.cpu_name = "snd-soc-dummy",

		.cpu_dai_name = "snd-soc-dummy-dai",

		.platform_name = "snd-soc-dummy",

		.ops = &odroid_card_be_ops,

		.no_pcm = 1,

		.dpcm_playback = 1,

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

				SND_SOC_DAIFMT_CBS_CFS,

		SND_SOC_DAILINK_REG(mixer),

	}, {

		/* Secondary FE <-> BE link */

		.playback_only = 1,

		.codec_name = "snd-soc-dummy",

		.codec_dai_name = "snd-soc-dummy-dai",

		.ops = &odroid_card_fe_ops,

		.name = "Secondary",

		.stream_name = "Secondary",

		.platform_name = "3830000.i2s-sec",

		.dynamic = 1,

		.dpcm_playback = 1,

		SND_SOC_DAILINK_REG(secondary),

	}

};
@@ -262,7 +271,7 @@ static int odroid_audio_probe(struct platform_device *pdev) 
			break;

		}



		ret = snd_soc_get_dai_name(&args, &link->cpu_dai_name);

		ret = snd_soc_get_dai_name(&args, &link->cpus->dai_name);

		of_node_put(args.np);



		if (ret < 0)