Merge tag 'sound-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "This development cycle resulted in a fair amount of changes in both
  core and driver sides. The most significant change in ALSA core is
  about PCM. Also the support of of-graph card and the new DAPM widget
  for DSP are noteworthy changes in ASoC core. And there're lots of
  small changes splat over the tree, as you can see in diffstat.

  Below are a few highlights:

  ALSA core:
   - Removal of set_fs() hackery from PCM core stuff, and the code
     reorganization / optimization thereafter
   - Improved support of PCM ack ops, and a new ABI for improved
     control/status mmap handling
   - Lots of constifications in various codes

  ASoC core:
   - The support of of-graph card, which may work as a better generic
     device for a replacement of simple-card
   - New widget types intended mainly for use with DSPs

  ASoC drivers:
   - New drivers for Allwinner V3s SoCs
   - Ensonic ES8316 codec support
   - More Intel SKL and KBL works
   - More device support for Intel SST Atom (mostly for cheap tablets
     and 2-in-1 devices)
   - Support for Rockchip PDM controllers
   - Support for STM32 I2S and S/PDIF controllers
   - Support for ZTE AUD96P22 codecs

  HD-audio:
   - Support of new Realtek codecs (ALC215/ALC285/ALC289), more quirks
     for HP and Dell machines
   - A few more fixes for i915 component binding"

* tag 'sound-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (418 commits)
  ALSA: hda - Fix unbalance of i915 module refcount
  ASoC: Intel: Skylake: Remove driver debugfs exit
  ASoC: Intel: Skylake: explicitly add the headers sst-dsp.h
  ALSA: hda/realtek - Remove GPIO_MASK
  ALSA: hda/realtek - Fix typo of pincfg for Dell quirk
  ALSA: pcm: add a documentation for tracepoints
  ALSA: atmel: ac97c: fix error return code in atmel_ac97c_probe()
  ALSA: x86: fix error return code in hdmi_lpe_audio_probe()
  ASoC: Intel: Skylake: Add support to read firmware registers
  ASoC: Intel: Skylake: Add sram address to sst_addr structure
  ASoC: Intel: Skylake: Debugfs facility to dump module config
  ASoC: Intel: Skylake: Add debugfs support
  ASoC: fix semicolon.cocci warnings
  ASoC: rt5645: Add quirk override by module option
  ASoC: rsnd: make arrays path and cmd_case static const
  ASoC: audio-graph-card: add widgets and routing for external amplifier support
  ASoC: audio-graph-card: update bindings for amplifier support
  ASoC: rt5665: calibration should be done before jack detection
  ASoC: rsnd: constify dev_pm_ops structures.
  ASoC: nau8825: change crosstalk-bypass property to bool type
  ...

1 files changed, 92 insertions, 2 deletions

diff --git a/sound/soc/codecs/cs35l35.c b/sound/soc/codecs/cs35l35.c
index f8aef5869b03..f1ee184ecab2 100644
--- a/sound/soc/codecs/cs35l35.c
+++ b/sound/soc/codecs/cs35l35.c
@@ -162,6 +162,14 @@ static bool cs35l35_precious_register(struct device *dev, unsigned int reg)
         }
 }
 
+static void cs35l35_reset(struct cs35l35_private *cs35l35)
+{
+        gpiod_set_value_cansleep(cs35l35->reset_gpio, 0);
+        usleep_range(2000, 2100);
+        gpiod_set_value_cansleep(cs35l35->reset_gpio, 1);
+        usleep_range(1000, 1100);
+}
+
 static int cs35l35_wait_for_pdn(struct cs35l35_private *cs35l35)
 {
         int ret;
@@ -756,6 +764,76 @@ static int cs35l35_codec_set_sysclk(struct snd_soc_codec *codec,
         return ret;
 }
 
+static int cs35l35_boost_inductor(struct cs35l35_private *cs35l35,
+                                  int inductor)
+{
+        struct regmap *regmap = cs35l35->regmap;
+        unsigned int bst_ipk = 0;
+
+        /*
+         * Digital Boost Converter Configuration for feedback,
+         * ramping, switching frequency, and estimation block seeding.
+         */
+
+        regmap_update_bits(regmap, CS35L35_BST_CONV_SW_FREQ,
+                           CS35L35_BST_CONV_SWFREQ_MASK, 0x00);
+
+        regmap_read(regmap, CS35L35_BST_PEAK_I, &bst_ipk);
+        bst_ipk &= CS35L35_BST_IPK_MASK;
+
+        switch (inductor) {
+        case 1000: /* 1 uH */
+                regmap_write(regmap, CS35L35_BST_CONV_COEF_1, 0x24);
+                regmap_write(regmap, CS35L35_BST_CONV_COEF_2, 0x24);
+                regmap_update_bits(regmap, CS35L35_BST_CONV_SW_FREQ,
+                                   CS35L35_BST_CONV_LBST_MASK, 0x00);
+
+                if (bst_ipk < 0x04)
+                        regmap_write(regmap, CS35L35_BST_CONV_SLOPE_COMP, 0x1B);
+                else
+                        regmap_write(regmap, CS35L35_BST_CONV_SLOPE_COMP, 0x4E);
+                break;
+        case 1200: /* 1.2 uH */
+                regmap_write(regmap, CS35L35_BST_CONV_COEF_1, 0x20);
+                regmap_write(regmap, CS35L35_BST_CONV_COEF_2, 0x20);
+                regmap_update_bits(regmap, CS35L35_BST_CONV_SW_FREQ,
+                                   CS35L35_BST_CONV_LBST_MASK, 0x01);
+
+                if (bst_ipk < 0x04)
+                        regmap_write(regmap, CS35L35_BST_CONV_SLOPE_COMP, 0x1B);
+                else
+                        regmap_write(regmap, CS35L35_BST_CONV_SLOPE_COMP, 0x47);
+                break;
+        case 1500: /* 1.5uH */
+                regmap_write(regmap, CS35L35_BST_CONV_COEF_1, 0x20);
+                regmap_write(regmap, CS35L35_BST_CONV_COEF_2, 0x20);
+                regmap_update_bits(regmap, CS35L35_BST_CONV_SW_FREQ,
+                                   CS35L35_BST_CONV_LBST_MASK, 0x02);
+
+                if (bst_ipk < 0x04)
+                        regmap_write(regmap, CS35L35_BST_CONV_SLOPE_COMP, 0x1B);
+                else
+                        regmap_write(regmap, CS35L35_BST_CONV_SLOPE_COMP, 0x3C);
+                break;
+        case 2200: /* 2.2uH */
+                regmap_write(regmap, CS35L35_BST_CONV_COEF_1, 0x19);
+                regmap_write(regmap, CS35L35_BST_CONV_COEF_2, 0x25);
+                regmap_update_bits(regmap, CS35L35_BST_CONV_SW_FREQ,
+                                   CS35L35_BST_CONV_LBST_MASK, 0x03);
+
+                if (bst_ipk < 0x04)
+                        regmap_write(regmap, CS35L35_BST_CONV_SLOPE_COMP, 0x1B);
+                else
+                        regmap_write(regmap, CS35L35_BST_CONV_SLOPE_COMP, 0x23);
+                break;
+        default:
+                dev_err(cs35l35->dev, "Invalid Inductor Value %d uH\n",
+                        inductor);
+                return -EINVAL;
+        }
+        return 0;
+}
+
 static int cs35l35_codec_probe(struct snd_soc_codec *codec)
 {
         struct cs35l35_private *cs35l35 = snd_soc_codec_get_drvdata(codec);
@@ -775,6 +853,10 @@ static int cs35l35_codec_probe(struct snd_soc_codec *codec)
                                 cs35l35->pdata.bst_ipk <<
                                 CS35L35_BST_IPK_SHIFT);
 
+        ret = cs35l35_boost_inductor(cs35l35, cs35l35->pdata.boost_ind);
+        if (ret)
+                return ret;
+
         if (cs35l35->pdata.gain_zc)
                 regmap_update_bits(cs35l35->regmap, CS35L35_PROTECT_CTL,
                                 CS35L35_AMP_GAIN_ZC_MASK,
@@ -1195,7 +1277,15 @@ static int cs35l35_handle_of_data(struct i2c_client *i2c_client,
                         return -EINVAL;
                 }
 
-                pdata->bst_ipk = (val32 - 1680) / 110;
+                pdata->bst_ipk = ((val32 - 1680) / 110) | CS35L35_VALID_PDATA;
+        }
+
+        ret = of_property_read_u32(np, "cirrus,boost-ind-nanohenry", &val32);
+        if (ret >= 0) {
+                pdata->boost_ind = val32;
+        } else {
+                dev_err(&i2c_client->dev, "Inductor not specified.\n");
+                return -EINVAL;
         }
 
         if (of_property_read_u32(np, "cirrus,sp-drv-strength", &val32) >= 0)
@@ -1454,7 +1544,7 @@ static int cs35l35_i2c_probe(struct i2c_client *i2c_client,
                 }
         }
 
-        gpiod_set_value_cansleep(cs35l35->reset_gpio, 1);
+        cs35l35_reset(cs35l35);
 
         init_completion(&cs35l35->pdn_done);