aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-03 17:41:09 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-04 11:50:19 -0400
commit565631008f6dd27c3e975c2103141f344d80b84e (patch)
tree77e63417d1024fd8b9a7b81d54100b422d120d6e /sound/soc/soc-dapm.c
parentd805002befc52a7edbfb0ec202a10a767e67515d (diff)
ASoC: Mark headphone, mic, speaker and line widgets as always connected
We're not actually doing any dynamic power management based on connection and output drivers (which are pretty much the same thing) are marked as unconditionally connected already. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index c1f3563133bc..cb00918b08d6 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -318,7 +318,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
318 } 318 }
319 } 319 }
320 break; 320 break;
321 /* does not effect routing - always connected */ 321 /* does not affect routing - always connected */
322 case snd_soc_dapm_pga: 322 case snd_soc_dapm_pga:
323 case snd_soc_dapm_out_drv: 323 case snd_soc_dapm_out_drv:
324 case snd_soc_dapm_output: 324 case snd_soc_dapm_output:
@@ -330,13 +330,13 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
330 case snd_soc_dapm_supply: 330 case snd_soc_dapm_supply:
331 case snd_soc_dapm_aif_in: 331 case snd_soc_dapm_aif_in:
332 case snd_soc_dapm_aif_out: 332 case snd_soc_dapm_aif_out:
333 p->connect = 1;
334 break;
335 /* does effect routing - dynamically connected */
336 case snd_soc_dapm_hp: 333 case snd_soc_dapm_hp:
337 case snd_soc_dapm_mic: 334 case snd_soc_dapm_mic:
338 case snd_soc_dapm_spk: 335 case snd_soc_dapm_spk:
339 case snd_soc_dapm_line: 336 case snd_soc_dapm_line:
337 p->connect = 1;
338 break;
339 /* does affect routing - dynamically connected */
340 case snd_soc_dapm_pre: 340 case snd_soc_dapm_pre:
341 case snd_soc_dapm_post: 341 case snd_soc_dapm_post:
342 p->connect = 0; 342 p->connect = 0;