ASoC: am3517evm: Let core to deal with the DAPM widgets (d2266025) · Commits · 戴 / test

sound/soc/omap/am3517evm.c

+5 −21

Original line number	Diff line number	Diff line
		@@ -90,26 +90,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
		{"MICIN", NULL, "Mic In"},
		};

		static int am3517evm_aic23_init(struct snd_soc_pcm_runtime *rtd)
		{
		struct snd_soc_codec *codec = rtd->codec;
		struct snd_soc_dapm_context *dapm = &codec->dapm;

		/* Add am3517-evm specific widgets */
		snd_soc_dapm_new_controls(dapm, tlv320aic23_dapm_widgets,
		ARRAY_SIZE(tlv320aic23_dapm_widgets));

		/* Set up davinci-evm specific audio path audio_map */
		snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));

		/* always connected */
		snd_soc_dapm_enable_pin(dapm, "Line Out");
		snd_soc_dapm_enable_pin(dapm, "Line In");
		snd_soc_dapm_enable_pin(dapm, "Mic In");

		return 0;
		}

		/* Digital audio interface glue - connects codec <--> CPU */
		static struct snd_soc_dai_link am3517evm_dai = {
		.name = "TLV320AIC23",
		@@ -120,7 +100,6 @@ static struct snd_soc_dai_link am3517evm_dai = {
		.codec_name = "tlv320aic23-codec.2-001a",
		.dai_fmt = SND_SOC_DAIFMT_DSP_B \| SND_SOC_DAIFMT_NB_NF \|
		SND_SOC_DAIFMT_CBM_CFM,
		.init = am3517evm_aic23_init,
		.ops = &am3517evm_ops,
		};

		@@ -129,6 +108,11 @@ static struct snd_soc_card snd_soc_am3517evm = {
		.name = "am3517evm",
		.dai_link = &am3517evm_dai,
		.num_links = 1,

		.dapm_widgets = tlv320aic23_dapm_widgets,
		.num_dapm_widgets = ARRAY_SIZE(tlv320aic23_dapm_widgets),
		.dapm_routes = audio_map,
		.num_dapm_routes = ARRAY_SIZE(audio_map),
		};

		static struct platform_device *am3517evm_snd_device;