aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-11-23 14:42:06 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-23 16:35:03 -0500
commit504855d171f4183ac231a5ecdf0273ac249cda2b (patch)
treecf25a0097dc8ac4c4665aca0adb294ec248d7aa0 /sound
parent6e5fdba9c9d4e2fdb19bf19633cb7b9bb72dccb1 (diff)
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/tegra/trimslice.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c
index d564b40756a9..043eb7c7eb73 100644
--- a/sound/soc/tegra/trimslice.c
+++ b/sound/soc/tegra/trimslice.c
@@ -119,7 +119,6 @@ static int trimslice_asoc_init(struct snd_soc_pcm_runtime *rtd)
119{ 119{
120 struct snd_soc_codec *codec = rtd->codec; 120 struct snd_soc_codec *codec = rtd->codec;
121 struct snd_soc_card *card = codec->card; 121 struct snd_soc_card *card = codec->card;
122 struct snd_soc_dapm_context *dapm = &codec->dapm;
123 int ret; 122 int ret;
124 123
125 ret = tegra_das_connect_dap_to_dac(TEGRA_DAS_DAP_ID_1, 124 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)
135 return ret; 134 return ret;
136 } 135 }
137 136
138 snd_soc_dapm_nc_pin(dapm, "LHPOUT");
139 snd_soc_dapm_nc_pin(dapm, "RHPOUT");
140 snd_soc_dapm_nc_pin(dapm, "MICIN");
141
142 return 0; 137 return 0;
143} 138}
144 139
@@ -162,6 +157,7 @@ static struct snd_soc_card snd_soc_trimslice = {
162 .num_dapm_widgets = ARRAY_SIZE(trimslice_dapm_widgets), 157 .num_dapm_widgets = ARRAY_SIZE(trimslice_dapm_widgets),
163 .dapm_routes = trimslice_audio_map, 158 .dapm_routes = trimslice_audio_map,
164 .num_dapm_routes = ARRAY_SIZE(trimslice_audio_map), 159 .num_dapm_routes = ARRAY_SIZE(trimslice_audio_map),
160 .fully_routed = true,
165}; 161};
166 162
167static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev) 163static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)