diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2015-02-16 15:41:02 +0000 |
|---|---|---|
| committer | Chanwoo Choi <cw00.choi@samsung.com> | 2015-03-04 09:41:48 +0900 |
| commit | 112bdfaa525fd5993e17885861342893f15290b0 (patch) | |
| tree | 9604310e1c88d9b8263b189fc809766aaf532c50 /sound/soc | |
| parent | 27a28d32b4f22a4ae687837aeda6afb42116cca4 (diff) | |
| download | blackbird-op-linux-112bdfaa525fd5993e17885861342893f15290b0.tar.gz blackbird-op-linux-112bdfaa525fd5993e17885861342893f15290b0.zip | |
extcon: arizona: Deobfuscate arizona_extcon_do_magic
arizona_extcon_do_magic does not lend a lot of clarity to the purpose
of the function, and as all the registers used are described in the
datasheet there is no need to obfuscate the code. This patch renames the
function to arizona_extcon_hp_clamp, as it controls clamping on the
headphone output.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/arizona.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 29202610dd0d..fb58c7ee3780 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -840,8 +840,8 @@ int arizona_hp_ev(struct snd_soc_dapm_widget *w, priv->arizona->hp_ena &= ~mask; priv->arizona->hp_ena |= val; - /* Force off if HPDET magic is active */ - if (priv->arizona->hpdet_magic) + /* Force off if HPDET clamp is active */ + if (priv->arizona->hpdet_clamp) val = 0; regmap_update_bits_async(arizona->regmap, ARIZONA_OUTPUT_ENABLES_1, |
