1 files changed, 222 insertions, 45 deletions

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index b562c7bf8a46..6ab03043fd60 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -39,11 +39,21 @@ int arizona_clk32k_enable(struct arizona *arizona)
 
         arizona->clk32k_ref++;
 
-        if (arizona->clk32k_ref == 1)
+        if (arizona->clk32k_ref == 1) {
+                switch (arizona->pdata.clk32k_src) {
+                case ARIZONA_32KZ_MCLK1:
+                        ret = pm_runtime_get_sync(arizona->dev);
+                        if (ret != 0)
+                                goto out;
+                        break;
+                }
+
                 ret = regmap_update_bits(arizona->regmap, ARIZONA_CLOCK_32K_1,
                                          ARIZONA_CLK_32K_ENA,
                                          ARIZONA_CLK_32K_ENA);
+        }
 
+out:
         if (ret != 0)
                 arizona->clk32k_ref--;
 
@@ -63,10 +73,17 @@ int arizona_clk32k_disable(struct arizona *arizona)
 
         arizona->clk32k_ref--;
 
-        if (arizona->clk32k_ref == 0)
+        if (arizona->clk32k_ref == 0) {
                 regmap_update_bits(arizona->regmap, ARIZONA_CLOCK_32K_1,
                                    ARIZONA_CLK_32K_ENA, 0);
 
+                switch (arizona->pdata.clk32k_src) {
+                case ARIZONA_32KZ_MCLK1:
+                        pm_runtime_put_sync(arizona->dev);
+                        break;
+                }
+        }
+
         mutex_unlock(&arizona->clk_lock);
 
         return ret;
@@ -179,42 +196,134 @@ static irqreturn_t arizona_overclocked(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-static int arizona_wait_for_boot(struct arizona *arizona)
+static int arizona_poll_reg(struct arizona *arizona,
+                            int timeout, unsigned int reg,
+                            unsigned int mask, unsigned int target)
 {
-        unsigned int reg;
+        unsigned int val = 0;
         int ret, i;
 
+        for (i = 0; i < timeout; i++) {
+                ret = regmap_read(arizona->regmap, reg, &val);
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to read reg %u: %d\n",
+                                reg, ret);
+                        continue;
+                }
+
+                if ((val & mask) == target)
+                        return 0;
+
+                msleep(1);
+        }
+
+        dev_err(arizona->dev, "Polling reg %u timed out: %x\n", reg, val);
+        return -ETIMEDOUT;
+}
+
+static int arizona_wait_for_boot(struct arizona *arizona)
+{
+        int ret;
+
         /*
          * We can't use an interrupt as we need to runtime resume to do so,
          * we won't race with the interrupt handler as it'll be blocked on
          * runtime resume.
          */
-        for (i = 0; i < 5; i++) {
-                msleep(1);
+        ret = arizona_poll_reg(arizona, 5, ARIZONA_INTERRUPT_RAW_STATUS_5,
+                               ARIZONA_BOOT_DONE_STS, ARIZONA_BOOT_DONE_STS);
 
-                ret = regmap_read(arizona->regmap,
-                                  ARIZONA_INTERRUPT_RAW_STATUS_5, &reg);
-                if (ret != 0) {
-                        dev_err(arizona->dev, "Failed to read boot state: %d\n",
-                                ret);
-                        continue;
-                }
+        if (!ret)
+                regmap_write(arizona->regmap, ARIZONA_INTERRUPT_STATUS_5,
+                             ARIZONA_BOOT_DONE_STS);
 
-                if (reg & ARIZONA_BOOT_DONE_STS)
-                        break;
+        pm_runtime_mark_last_busy(arizona->dev);
+
+        return ret;
+}
+
+static int arizona_apply_hardware_patch(struct arizona* arizona)
+{
+        unsigned int fll, sysclk;
+        int ret, err;
+
+        regcache_cache_bypass(arizona->regmap, true);
+
+        /* Cache existing FLL and SYSCLK settings */
+        ret = regmap_read(arizona->regmap, ARIZONA_FLL1_CONTROL_1, &fll);
+        if (ret != 0) {
+                dev_err(arizona->dev, "Failed to cache FLL settings: %d\n",
+                        ret);
+                return ret;
+        }
+        ret = regmap_read(arizona->regmap, ARIZONA_SYSTEM_CLOCK_1, &sysclk);
+        if (ret != 0) {
+                dev_err(arizona->dev, "Failed to cache SYSCLK settings: %d\n",
+                        ret);
+                return ret;
         }
 
-        if (reg & ARIZONA_BOOT_DONE_STS) {
-                regmap_write(arizona->regmap, ARIZONA_INTERRUPT_STATUS_5,
-                             ARIZONA_BOOT_DONE_STS);
-        } else {
-                dev_err(arizona->dev, "Device boot timed out: %x\n", reg);
-                return -ETIMEDOUT;
+        /* Start up SYSCLK using the FLL in free running mode */
+        ret = regmap_write(arizona->regmap, ARIZONA_FLL1_CONTROL_1,
+                        ARIZONA_FLL1_ENA | ARIZONA_FLL1_FREERUN);
+        if (ret != 0) {
+                dev_err(arizona->dev,
+                        "Failed to start FLL in freerunning mode: %d\n",
+                        ret);
+                return ret;
+        }
+        ret = arizona_poll_reg(arizona, 25, ARIZONA_INTERRUPT_RAW_STATUS_5,
+                               ARIZONA_FLL1_CLOCK_OK_STS,
+                               ARIZONA_FLL1_CLOCK_OK_STS);
+        if (ret != 0) {
+                ret = -ETIMEDOUT;
+                goto err_fll;
         }
 
-        pm_runtime_mark_last_busy(arizona->dev);
+        ret = regmap_write(arizona->regmap, ARIZONA_SYSTEM_CLOCK_1, 0x0144);
+        if (ret != 0) {
+                dev_err(arizona->dev, "Failed to start SYSCLK: %d\n", ret);
+                goto err_fll;
+        }
 
-        return 0;
+        /* Start the write sequencer and wait for it to finish */
+        ret = regmap_write(arizona->regmap, ARIZONA_WRITE_SEQUENCER_CTRL_0,
+                        ARIZONA_WSEQ_ENA | ARIZONA_WSEQ_START | 160);
+        if (ret != 0) {
+                dev_err(arizona->dev, "Failed to start write sequencer: %d\n",
+                        ret);
+                goto err_sysclk;
+        }
+        ret = arizona_poll_reg(arizona, 5, ARIZONA_WRITE_SEQUENCER_CTRL_1,
+                               ARIZONA_WSEQ_BUSY, 0);
+        if (ret != 0) {
+                regmap_write(arizona->regmap, ARIZONA_WRITE_SEQUENCER_CTRL_0,
+                                ARIZONA_WSEQ_ABORT);
+                ret = -ETIMEDOUT;
+        }
+
+err_sysclk:
+        err = regmap_write(arizona->regmap, ARIZONA_SYSTEM_CLOCK_1, sysclk);
+        if (err != 0) {
+                dev_err(arizona->dev,
+                        "Failed to re-apply old SYSCLK settings: %d\n",
+                        err);
+        }
+
+err_fll:
+        err = regmap_write(arizona->regmap, ARIZONA_FLL1_CONTROL_1, fll);
+        if (err != 0) {
+                dev_err(arizona->dev,
+                        "Failed to re-apply old FLL settings: %d\n",
+                        err);
+        }
+
+        regcache_cache_bypass(arizona->regmap, false);
+
+        if (ret != 0)
+                return ret;
+        else
+                return err;
 }
 
 #ifdef CONFIG_PM_RUNTIME
@@ -233,20 +342,44 @@ static int arizona_runtime_resume(struct device *dev)
 
         regcache_cache_only(arizona->regmap, false);
 
-        ret = arizona_wait_for_boot(arizona);
-        if (ret != 0) {
-                regulator_disable(arizona->dcvdd);
-                return ret;
+        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;
+                }
+
+                ret = arizona_apply_hardware_patch(arizona);
+                if (ret != 0) {
+                        dev_err(arizona->dev,
+                                "Failed to apply hardware patch: %d\n",
+                                ret);
+                        goto err;
+                }
+                break;
+        default:
+                ret = arizona_wait_for_boot(arizona);
+                if (ret != 0) {
+                        goto err;
+                }
+
+                break;
         }
 
         ret = regcache_sync(arizona->regmap);
         if (ret != 0) {
                 dev_err(arizona->dev, "Failed to restore register cache\n");
-                regulator_disable(arizona->dcvdd);
-                return ret;
+                goto err;
         }
 
         return 0;
+
+err:
+        regcache_cache_only(arizona->regmap, true);
+        regulator_disable(arizona->dcvdd);
+        return ret;
 }
 
 static int arizona_runtime_suspend(struct device *dev)
@@ -371,6 +504,17 @@ int arizona_dev_init(struct arizona *arizona)
                 goto err_early;
         }
 
+        if (arizona->pdata.reset) {
+                /* Start out with /RESET low to put the chip into reset */
+                ret = gpio_request_one(arizona->pdata.reset,
+                                       GPIOF_DIR_OUT | GPIOF_INIT_LOW,
+                                       "arizona /RESET");
+                if (ret != 0) {
+                        dev_err(dev, "Failed to request /RESET: %d\n", ret);
+                        goto err_early;
+                }
+        }
+
         ret = regulator_bulk_enable(arizona->num_core_supplies,
                                     arizona->core_supplies);
         if (ret != 0) {
@@ -386,16 +530,8 @@ int arizona_dev_init(struct arizona *arizona)
         }
 
         if (arizona->pdata.reset) {
-                /* Start out with /RESET low to put the chip into reset */
-                ret = gpio_request_one(arizona->pdata.reset,
-                                       GPIOF_DIR_OUT | GPIOF_INIT_LOW,
-                                       "arizona /RESET");
-                if (ret != 0) {
-                        dev_err(dev, "Failed to request /RESET: %d\n", ret);
-                        goto err_dcvdd;
-                }
-
                 gpio_set_value_cansleep(arizona->pdata.reset, 1);
+                msleep(1);
         }
 
         regcache_cache_only(arizona->regmap, false);
@@ -424,6 +560,7 @@ int arizona_dev_init(struct arizona *arizona)
                         arizona->type = WM5102;
                 }
                 apply_patch = wm5102_patch;
+                arizona->rev &= 0x7;
                 break;
 #endif
 #ifdef CONFIG_MFD_WM5110
@@ -454,6 +591,8 @@ int arizona_dev_init(struct arizona *arizona)
                         goto err_reset;
                 }
 
+                msleep(1);
+
                 ret = regcache_sync(arizona->regmap);
                 if (ret != 0) {
                         dev_err(dev, "Failed to sync device: %d\n", ret);
@@ -461,10 +600,24 @@ int arizona_dev_init(struct arizona *arizona)
                 }
         }
 
-        ret = arizona_wait_for_boot(arizona);
-        if (ret != 0) {
-                dev_err(arizona->dev, "Device failed initial boot: %d\n", ret);
-                goto err_reset;
+        switch (arizona->type) {
+        case WM5102:
+                ret = regmap_read(arizona->regmap, 0x19, &val);
+                if (ret != 0)
+                        dev_err(dev,
+                                "Failed to check write sequencer state: %d\n",
+                                ret);
+                else if (val & 0x01)
+                        break;
+                /* Fall through */
+        default:
+                ret = arizona_wait_for_boot(arizona);
+                if (ret != 0) {
+                        dev_err(arizona->dev,
+                                "Device failed initial boot: %d\n", ret);
+                        goto err_reset;
+                }
+                break;
         }
 
         if (apply_patch) {
@@ -474,6 +627,20 @@ int arizona_dev_init(struct arizona *arizona)
                                 ret);
                         goto err_reset;
                 }
+
+                switch (arizona->type) {
+                case WM5102:
+                        ret = arizona_apply_hardware_patch(arizona);
+                        if (ret != 0) {
+                                dev_err(arizona->dev,
+                                        "Failed to apply hardware patch: %d\n",
+                                        ret);
+                                goto err_reset;
+                        }
+                        break;
+                default:
+                        break;
+                }
         }
 
         for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {
@@ -498,6 +665,7 @@ int arizona_dev_init(struct arizona *arizona)
                 regmap_update_bits(arizona->regmap, ARIZONA_CLOCK_32K_1,
                                    ARIZONA_CLK_32K_SRC_MASK,
                                    arizona->pdata.clk32k_src - 1);
+                arizona_clk32k_enable(arizona);
                 break;
         case ARIZONA_32KZ_NONE:
                 regmap_update_bits(arizona->regmap, ARIZONA_CLOCK_32K_1,
@@ -511,10 +679,16 @@ int arizona_dev_init(struct arizona *arizona)
         }
 
         for (i = 0; i < ARIZONA_MAX_MICBIAS; i++) {
-                if (!arizona->pdata.micbias[i].mV)
+                if (!arizona->pdata.micbias[i].mV &&
+                    !arizona->pdata.micbias[i].bypass)
                         continue;
 
+                /* Apply default for bypass mode */
+                if (!arizona->pdata.micbias[i].mV)
+                        arizona->pdata.micbias[i].mV = 2800;
+
                 val = (arizona->pdata.micbias[i].mV - 1500) / 100;
+
                 val <<= ARIZONA_MICB1_LVL_SHIFT;
 
                 if (arizona->pdata.micbias[i].ext_cap)
@@ -526,10 +700,14 @@ int arizona_dev_init(struct arizona *arizona)
                 if (arizona->pdata.micbias[i].fast_start)
                         val |= ARIZONA_MICB1_RATE;
 
+                if (arizona->pdata.micbias[i].bypass)
+                        val |= ARIZONA_MICB1_BYPASS;
+
                 regmap_update_bits(arizona->regmap,
                                    ARIZONA_MIC_BIAS_CTRL_1 + i,
                                    ARIZONA_MICB1_LVL_MASK |
                                    ARIZONA_MICB1_DISCH |
+                                   ARIZONA_MICB1_BYPASS |
                                    ARIZONA_MICB1_RATE, val);
         }
 
@@ -610,10 +788,9 @@ err_irq:
         arizona_irq_exit(arizona);
 err_reset:
         if (arizona->pdata.reset) {
-                gpio_set_value_cansleep(arizona->pdata.reset, 1);
+                gpio_set_value_cansleep(arizona->pdata.reset, 0);
                 gpio_free(arizona->pdata.reset);
         }
-err_dcvdd:
         regulator_disable(arizona->dcvdd);
 err_enable:
         regulator_bulk_disable(arizona->num_core_supplies,