aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-11-23 09:04:12 -0500
committerMark Brown <broonie@kernel.org>2014-11-24 13:04:49 -0500
commita6e4599f8d232b5911c46bb16f5a79b86f3dfb75 (patch)
tree97e0f8727e178440a31cd6bfbc5e3d56e3ea2bbc
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
ASoC: uda134x: Remove is_powered_on_standby from platform data
According to its documentation the is_powered_on_standby field of the uda134x platform data is supposed to prevent the the driver from shutting down the ADC and DAC in standby mode. This behavior was broken in commit commit f0fba2ad1b6b ("ASoC: multi-component - ASoC Multi-Component Support") almost 5 years ago and all the flag does now is cause the driver to go to SND_SOC_BIAS_ON in probe, just for the ASoC core to put it back into SND_SOC_BIAS_STANDBY right after probe. Apparently the intended behavior has not been missed, so just remove is_powered_on_standby from the platform data struct. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--include/sound/uda134x.h12
-rw-r--r--sound/soc/codecs/uda134x.c5
2 files changed, 1 insertions, 16 deletions
diff --git a/include/sound/uda134x.h b/include/sound/uda134x.h
index e475659bd3be..509efb050176 100644
--- a/include/sound/uda134x.h
+++ b/include/sound/uda134x.h
@@ -18,18 +18,6 @@ struct uda134x_platform_data {
18 struct l3_pins l3; 18 struct l3_pins l3;
19 void (*power) (int); 19 void (*power) (int);
20 int model; 20 int model;
21 /*
22 ALSA SOC usually puts the device in standby mode when it's not used
23 for sometime. If you unset is_powered_on_standby the driver will
24 turn off the ADC/DAC when this callback is invoked and turn it back
25 on when needed. Unfortunately this will result in a very light bump
26 (it can be audible only with good earphones). If this bothers you
27 set is_powered_on_standby, you will have slightly higher power
28 consumption. Please note that sending the L3 command for ADC is
29 enough to make the bump, so it doesn't make difference if you
30 completely take off power from the codec.
31 */
32 int is_powered_on_standby;
33#define UDA134X_UDA1340 1 21#define UDA134X_UDA1340 1
34#define UDA134X_UDA1341 2 22#define UDA134X_UDA1341 2
35#define UDA134X_UDA1344 3 23#define UDA134X_UDA1344 3
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index 32b2f78aa62c..54240f14211f 100644
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -518,10 +518,7 @@ static int uda134x_soc_probe(struct snd_soc_codec *codec)
518 518
519 uda134x_reset(codec); 519 uda134x_reset(codec);
520 520
521 if (pd->is_powered_on_standby) 521 uda134x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
522 uda134x_set_bias_level(codec, SND_SOC_BIAS_ON);
523 else
524 uda134x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
525 522
526 if (pd->model == UDA134X_UDA1341) { 523 if (pd->model == UDA134X_UDA1341) {
527 widgets = uda1341_dapm_widgets; 524 widgets = uda1341_dapm_widgets;