1 files changed, 98 insertions, 31 deletions

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 802e05eae3e9..8a2221ab3d10 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -1366,7 +1366,7 @@ static void arizona_wm5102_set_dac_comp(struct snd_soc_codec *codec,
 {
         struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
         struct arizona *arizona = priv->arizona;
-        struct reg_default dac_comp[] = {
+        struct reg_sequence dac_comp[] = {
                 { 0x80, 0x3 },
                 { ARIZONA_DAC_COMP_1, 0 },
                 { ARIZONA_DAC_COMP_2, 0 },
@@ -1504,7 +1504,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
         else
                 rates = &arizona_48k_bclk_rates[0];
 
-        wl = snd_pcm_format_width(params_format(params));
+        wl = params_width(params);
 
         if (tdm_slots) {
                 arizona_aif_dbg(dai, "Configuring for %d %d bit TDM slots\n",
@@ -1756,17 +1756,6 @@ int arizona_init_dai(struct arizona_priv *priv, int id)
 }
 EXPORT_SYMBOL_GPL(arizona_init_dai);
 
-static irqreturn_t arizona_fll_clock_ok(int irq, void *data)
-{
-        struct arizona_fll *fll = data;
-
-        arizona_fll_dbg(fll, "clock OK\n");
-
-        complete(&fll->ok);
-
-        return IRQ_HANDLED;
-}
-
 static struct {
         unsigned int min;
         unsigned int max;
@@ -2048,17 +2037,18 @@ static int arizona_is_enabled_fll(struct arizona_fll *fll)
 static int arizona_enable_fll(struct arizona_fll *fll)
 {
         struct arizona *arizona = fll->arizona;
-        unsigned long time_left;
         bool use_sync = false;
         int already_enabled = arizona_is_enabled_fll(fll);
         struct arizona_fll_cfg cfg;
+        int i;
+        unsigned int val;
 
         if (already_enabled < 0)
                 return already_enabled;
 
         if (already_enabled) {
                 /* Facilitate smooth refclk across the transition */
-                regmap_update_bits_async(fll->arizona->regmap, fll->base + 0x7,
+                regmap_update_bits_async(fll->arizona->regmap, fll->base + 0x9,
                                          ARIZONA_FLL1_GAIN_MASK, 0);
                 regmap_update_bits_async(fll->arizona->regmap, fll->base + 1,
                                          ARIZONA_FLL1_FREERUN,
@@ -2110,9 +2100,6 @@ static int arizona_enable_fll(struct arizona_fll *fll)
         if (!already_enabled)
                 pm_runtime_get(arizona->dev);
 
-        /* Clear any pending completions */
-        try_wait_for_completion(&fll->ok);
-
         regmap_update_bits_async(arizona->regmap, fll->base + 1,
                                  ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA);
         if (use_sync)
@@ -2124,10 +2111,24 @@ static int arizona_enable_fll(struct arizona_fll *fll)
                 regmap_update_bits_async(arizona->regmap, fll->base + 1,
                                          ARIZONA_FLL1_FREERUN, 0);
 
-        time_left = wait_for_completion_timeout(&fll->ok,
-                                          msecs_to_jiffies(250));
-        if (time_left == 0)
+        arizona_fll_dbg(fll, "Waiting for FLL lock...\n");
+        val = 0;
+        for (i = 0; i < 15; i++) {
+                if (i < 5)
+                        usleep_range(200, 400);
+                else
+                        msleep(20);
+
+                regmap_read(arizona->regmap,
+                            ARIZONA_INTERRUPT_RAW_STATUS_5,
+                            &val);
+                if (val & (ARIZONA_FLL1_CLOCK_OK_STS << (fll->id - 1)))
+                        break;
+        }
+        if (i == 15)
                 arizona_fll_warn(fll, "Timed out waiting for lock\n");
+        else
+                arizona_fll_dbg(fll, "FLL locked (%d polls)\n", i);
 
         return 0;
 }
@@ -2212,11 +2213,8 @@ EXPORT_SYMBOL_GPL(arizona_set_fll);
 int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq,
                      int ok_irq, struct arizona_fll *fll)
 {
-        int ret;
         unsigned int val;
 
-        init_completion(&fll->ok);
-
         fll->id = id;
         fll->base = base;
         fll->arizona = arizona;
@@ -2238,13 +2236,6 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq,
         snprintf(fll->clock_ok_name, sizeof(fll->clock_ok_name),
                  "FLL%d clock OK", id);
 
-        ret = arizona_request_irq(arizona, ok_irq, fll->clock_ok_name,
-                                  arizona_fll_clock_ok, fll);
-        if (ret != 0) {
-                dev_err(arizona->dev, "Failed to get FLL%d clock OK IRQ: %d\n",
-                        id, ret);
-        }
-
         regmap_update_bits(arizona->regmap, fll->base + 1,
                            ARIZONA_FLL1_FREERUN, 0);
 
@@ -2313,6 +2304,82 @@ const struct snd_kcontrol_new arizona_adsp2_rate_controls[] = {
 };
 EXPORT_SYMBOL_GPL(arizona_adsp2_rate_controls);
 
+static bool arizona_eq_filter_unstable(bool mode, __be16 _a, __be16 _b)
+{
+        s16 a = be16_to_cpu(_a);
+        s16 b = be16_to_cpu(_b);
+
+        if (!mode) {
+                return abs(a) >= 4096;
+        } else {
+                if (abs(b) >= 4096)
+                        return true;
+
+                return (abs((a << 16) / (4096 - b)) >= 4096 << 4);
+        }
+}
+
+int arizona_eq_coeff_put(struct snd_kcontrol *kcontrol,
+                         struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+        struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
+        struct soc_bytes *params = (void *)kcontrol->private_value;
+        unsigned int val;
+        __be16 *data;
+        int len;
+        int ret;
+
+        len = params->num_regs * regmap_get_val_bytes(arizona->regmap);
+
+        data = kmemdup(ucontrol->value.bytes.data, len, GFP_KERNEL | GFP_DMA);
+        if (!data)
+                return -ENOMEM;
+
+        data[0] &= cpu_to_be16(ARIZONA_EQ1_B1_MODE);
+
+        if (arizona_eq_filter_unstable(!!data[0], data[1], data[2]) ||
+            arizona_eq_filter_unstable(true, data[4], data[5]) ||
+            arizona_eq_filter_unstable(true, data[8], data[9]) ||
+            arizona_eq_filter_unstable(true, data[12], data[13]) ||
+            arizona_eq_filter_unstable(false, data[16], data[17])) {
+                dev_err(arizona->dev, "Rejecting unstable EQ coefficients\n");
+                ret = -EINVAL;
+                goto out;
+        }
+
+        ret = regmap_read(arizona->regmap, params->base, &val);
+        if (ret != 0)
+                goto out;
+
+        val &= ~ARIZONA_EQ1_B1_MODE;
+        data[0] |= cpu_to_be16(val);
+
+        ret = regmap_raw_write(arizona->regmap, params->base, data, len);
+
+out:
+        kfree(data);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(arizona_eq_coeff_put);
+
+int arizona_lhpf_coeff_put(struct snd_kcontrol *kcontrol,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+        struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
+        __be16 *data = (__be16 *)ucontrol->value.bytes.data;
+        s16 val = be16_to_cpu(*data);
+
+        if (abs(val) >= 4096) {
+                dev_err(arizona->dev, "Rejecting unstable LHPF coefficients\n");
+                return -EINVAL;
+        }
+
+        return snd_soc_bytes_put(kcontrol, ucontrol);
+}
+EXPORT_SYMBOL_GPL(arizona_lhpf_coeff_put);
+
 MODULE_DESCRIPTION("ASoC Wolfson Arizona class device support");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");