hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Stephen Warren 2011-11-23 12:42:06 -07:00 committed by Mark Brown
parent 6e5fdba9c9
commit 504855d171
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/tegra/trimslice.c
View File

@ -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_codec *codec = rtd->codec;
struct snd_soc_card *card = codec->card; struct snd_soc_card *card = codec->card;
struct snd_soc_dapm_context *dapm = &codec->dapm;
int ret; int ret;
ret = tegra_das_connect_dap_to_dac(TEGRA_DAS_DAP_ID_1, 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; 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; return 0;
} }
@ -162,6 +157,7 @@ static struct snd_soc_card snd_soc_trimslice = {
.num_dapm_widgets = ARRAY_SIZE(trimslice_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(trimslice_dapm_widgets),
.dapm_routes = trimslice_audio_map, .dapm_routes = trimslice_audio_map,
.num_dapm_routes = ARRAY_SIZE(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) static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)