Merge tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[firefly-linux-kernel-4.4.55.git] / sound / soc / codecs / arizona.c

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 29202610dd0dd90d72329265633844a3d833d640..eff4b4d512b7b8fbd8bfa31c3c0ee3a79474a478 100644 (file)
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -19,7 +19,6 @@
 #include <sound/tlv.h>
 
 #include <linux/mfd/arizona/core.h>
-#include <linux/mfd/arizona/gpio.h>
 #include <linux/mfd/arizona/registers.h>
 
 #include "arizona.h"
@@ -281,6 +280,7 @@ int arizona_init_gpio(struct snd_soc_codec *codec)
 
        switch (arizona->type) {
        case WM5110:
+       case WM8280:
                snd_soc_dapm_disable_pin(&codec->dapm, "DRC2 Signal Activity");
                break;
        default:
@@ -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,
@@ -1729,6 +1729,7 @@ static int arizona_calc_fratio(struct arizona_fll *fll,
 
        switch (fll->arizona->type) {
        case WM5110:
+       case WM8280:
                if (fll->arizona->rev < 3 || sync)
                        return init_ratio;
                break;
@@ -1901,7 +1902,7 @@ static int arizona_is_enabled_fll(struct arizona_fll *fll)
 static int arizona_enable_fll(struct arizona_fll *fll)
 {
        struct arizona *arizona = fll->arizona;
-       int ret;
+       unsigned long time_left;
        bool use_sync = false;
        int already_enabled = arizona_is_enabled_fll(fll);
        struct arizona_fll_cfg cfg;
@@ -1977,9 +1978,9 @@ static int arizona_enable_fll(struct arizona_fll *fll)
                regmap_update_bits_async(arizona->regmap, fll->base + 1,
                                         ARIZONA_FLL1_FREERUN, 0);
 
-       ret = wait_for_completion_timeout(&fll->ok,
+       time_left = wait_for_completion_timeout(&fll->ok,
                                          msecs_to_jiffies(250));
-       if (ret == 0)
+       if (time_left == 0)
                arizona_fll_warn(fll, "Timed out waiting for lock\n");
 
        return 0;