Unverified Commit 0391b033 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: samsung: neo1973_wm8753: 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 3cddda10

sound/soc/samsung/neo1973_wm8753.c

+11 −7
Original line number Diff line number Diff line
@@ -266,28 +266,32 @@ static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd) 
	return 0;

}



SND_SOC_DAILINK_DEFS(wm8753,

	DAILINK_COMP_ARRAY(COMP_CPU("s3c24xx-iis")),

	DAILINK_COMP_ARRAY(COMP_CODEC("wm8753.0-001a", "wm8753-hifi")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("s3c24xx-iis")));



SND_SOC_DAILINK_DEFS(bluetooth,

	DAILINK_COMP_ARRAY(COMP_CPU("bt-sco-pcm")),

	DAILINK_COMP_ARRAY(COMP_CODEC("wm8753.0-001a", "wm8753-voice")));



static struct snd_soc_dai_link neo1973_dai[] = {

{ /* Hifi Playback - for similatious use with voice below */

	.name = "WM8753",

	.stream_name = "WM8753 HiFi",

	.platform_name = "s3c24xx-iis",

	.cpu_dai_name = "s3c24xx-iis",

	.codec_dai_name = "wm8753-hifi",

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

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBM_CFM,

	.init = neo1973_wm8753_init,

	.ops = &neo1973_hifi_ops,

	SND_SOC_DAILINK_REG(wm8753),

},

{ /* Voice via BT */

	.name = "Bluetooth",

	.stream_name = "Voice",

	.cpu_dai_name = "bt-sco-pcm",

	.codec_dai_name = "wm8753-voice",

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

	.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBS_CFS,

	.ops = &neo1973_voice_ops,

	SND_SOC_DAILINK_REG(bluetooth),

},

};