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

ASoC: samsung: smdk_wm8580: 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 5af5e760

sound/soc/samsung/smdk_wm8580.c

+12 −8
Original line number Diff line number Diff line
@@ -140,27 +140,31 @@ enum { 
#define SMDK_DAI_FMT (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | \

	SND_SOC_DAIFMT_CBM_CFM)



SND_SOC_DAILINK_DEFS(paif_rx,

	DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.2")),

	DAILINK_COMP_ARRAY(COMP_CODEC("wm8580.0-001b", "wm8580-hifi-playback")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0")));



SND_SOC_DAILINK_DEFS(paif_tx,

	DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.2")),

	DAILINK_COMP_ARRAY(COMP_CODEC("wm8580.0-001b", "wm8580-hifi-capture")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0")));



static struct snd_soc_dai_link smdk_dai[] = {

	[PRI_PLAYBACK] = { /* Primary Playback i/f */

		.name = "WM8580 PAIF RX",

		.stream_name = "Playback",

		.cpu_dai_name = "samsung-i2s.2",

		.codec_dai_name = "wm8580-hifi-playback",

		.platform_name = "samsung-i2s.0",

		.codec_name = "wm8580.0-001b",

		.dai_fmt = SMDK_DAI_FMT,

		.ops = &smdk_ops,

		SND_SOC_DAILINK_REG(paif_rx),

	},

	[PRI_CAPTURE] = { /* Primary Capture i/f */

		.name = "WM8580 PAIF TX",

		.stream_name = "Capture",

		.cpu_dai_name = "samsung-i2s.2",

		.codec_dai_name = "wm8580-hifi-capture",

		.platform_name = "samsung-i2s.0",

		.codec_name = "wm8580.0-001b",

		.dai_fmt = SMDK_DAI_FMT,

		.init = smdk_wm8580_init_paiftx,

		.ops = &smdk_ops,

		SND_SOC_DAILINK_REG(paif_tx),

	},

};