Skip to content

Commit

Permalink
ASoC: TrimSlice machine: Set the new fully_routed flag
Browse files Browse the repository at this point in the history
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: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Stephen Warren authored and Mark Brown committed Nov 23, 2011
1 parent 6e5fdba commit 504855d
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions sound/soc/tegra/trimslice.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
}

Expand All @@ -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)
Expand Down

0 comments on commit 504855d

Please sign in to comment.