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

ASoC: ti: omap3pandora: 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 acb9a2d5

sound/soc/ti/omap3pandora.c

+12 −8
Original line number Diff line number Diff line
@@ -189,29 +189,33 @@ static const struct snd_soc_ops omap3pandora_ops = { 
};



/* Digital audio interface glue - connects codec <--> CPU */

SND_SOC_DAILINK_DEFS(out,

	DAILINK_COMP_ARRAY(COMP_CPU("omap-mcbsp.2")),

	DAILINK_COMP_ARRAY(COMP_CODEC("twl4030-codec", "twl4030-hifi")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("omap-mcbsp.2")));



SND_SOC_DAILINK_DEFS(in,

	DAILINK_COMP_ARRAY(COMP_CPU("omap-mcbsp.4")),

	DAILINK_COMP_ARRAY(COMP_CODEC("twl4030-codec", "twl4030-hifi")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("omap-mcbsp.4")));



static struct snd_soc_dai_link omap3pandora_dai[] = {

	{

		.name = "PCM1773",

		.stream_name = "HiFi Out",

		.cpu_dai_name = "omap-mcbsp.2",

		.codec_dai_name = "twl4030-hifi",

		.platform_name = "omap-mcbsp.2",

		.codec_name = "twl4030-codec",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			   SND_SOC_DAIFMT_CBS_CFS,

		.ops = &omap3pandora_ops,

		.init = omap3pandora_out_init,

		SND_SOC_DAILINK_REG(out),

	}, {

		.name = "TWL4030",

		.stream_name = "Line/Mic In",

		.cpu_dai_name = "omap-mcbsp.4",

		.codec_dai_name = "twl4030-hifi",

		.platform_name = "omap-mcbsp.4",

		.codec_name = "twl4030-codec",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			   SND_SOC_DAIFMT_CBS_CFS,

		.ops = &omap3pandora_ops,

		.init = omap3pandora_in_init,

		SND_SOC_DAILINK_REG(in),

	}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE