Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 504855d1 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

ASoC: TrimSlice machine: Set the new fully_routed flag 



Set card.fully_routed to request the ASoC core calculated unused codec
pins, and call snd_soc_dapm_nc_pin() for them. Remove the open-coded
calls.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 6e5fdba9

sound/soc/tegra/trimslice.c

+1 −5
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ static int trimslice_asoc_init(struct snd_soc_pcm_runtime *rtd) 
{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_card *card = codec->card;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	int ret;



	ret = tegra_das_connect_dap_to_dac(TEGRA_DAS_DAP_ID_1,
@@ -135,10 +134,6 @@ static int trimslice_asoc_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	snd_soc_dapm_nc_pin(dapm, "LHPOUT");

	snd_soc_dapm_nc_pin(dapm, "RHPOUT");

	snd_soc_dapm_nc_pin(dapm, "MICIN");



	return 0;

}
@@ -162,6 +157,7 @@ static struct snd_soc_card snd_soc_trimslice = { 
	.num_dapm_widgets = ARRAY_SIZE(trimslice_dapm_widgets),

	.dapm_routes = trimslice_audio_map,

	.num_dapm_routes = ARRAY_SIZE(trimslice_audio_map),

	.fully_routed = true,

};



static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)