Merge tag 'for-v3.19/omap-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw...

[cascardo/linux.git] / drivers / mfd / arizona-core.c

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 4afb232..bce7c07 100644 (file)
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -393,18 +393,6 @@ static int arizona_runtime_resume(struct device *dev)
                break;
        }
 
-       switch (arizona->type) {
-       case WM5102:
-               ret = wm5102_patch(arizona);
-               if (ret != 0) {
-                       dev_err(arizona->dev, "Failed to apply patch: %d\n",
-                               ret);
-                       goto err;
-               }
-       default:
-               break;
-       }
-
        ret = regcache_sync(arizona->regmap);
        if (ret != 0) {
                dev_err(arizona->dev, "Failed to restore register cache\n");
@@ -959,6 +947,7 @@ int arizona_dev_init(struct arizona *arizona)
                regmap_update_bits(arizona->regmap,
                                   ARIZONA_MIC_BIAS_CTRL_1 + i,
                                   ARIZONA_MICB1_LVL_MASK |
+                                  ARIZONA_MICB1_EXT_CAP |
                                   ARIZONA_MICB1_DISCH |
                                   ARIZONA_MICB1_BYPASS |
                                   ARIZONA_MICB1_RATE, val);