Merge remote-tracking branches 'asoc/topic/tas2552', 'asoc/topic/tas5086', 'asoc...

diff --cc include/sound/soc-topology.h
index 427bc41df3aef3a3f931bd94830f027bafea2661,865a141b118b15874e27b0e56473bac8854c4823,865a141b118b15874e27b0e56473bac8854c4823,865a141b118b15874e27b0e56473bac8854c4823,865a141b118b15874e27b0e56473bac8854c4823,ea387ed8f98be37732a210a82b159a863f5884d8..086cd7ff6ddcbb457ee31277baf3fee143f0181d
--- 1/include/sound/soc-topology.h
--- 2/include/sound/soc-topology.h
--- 3/include/sound/soc-topology.h
--- 4/include/sound/soc-topology.h
--- 5/include/sound/soc-topology.h
--- 6/include/sound/soc-topology.h
+++ b/include/sound/soc-topology.h
@@@@@@@ -136,13 -136,11 -136,11 -136,11 -136,11 -143,15 +143,17 @@@@@@@ struct snd_soc_tplg_ops 
        int (*manifest)(struct snd_soc_component *,
                struct snd_soc_tplg_manifest *);
      
-----   /* bespoke kcontrol handlers available for binding */
+++++   /* vendor specific kcontrol handlers available for binding */
        const struct snd_soc_tplg_kcontrol_ops *io_ops;
        int io_ops_count;
+++++ 
+++++   /* vendor specific bytes ext handlers available for binding */
+++++   const struct snd_soc_tplg_bytes_ext_ops *bytes_ext_ops;
+++++   int bytes_ext_ops_count;
      };
      
 +++++#ifdef CONFIG_SND_SOC_TOPOLOGY
 +++++
      /* gets a pointer to data from the firmware block header */
      static inline const void *snd_soc_tplg_get_data(struct snd_soc_tplg_hdr *hdr)
      {

diff --cc sound/soc/codecs/88pm860x-codec.c
Simple merge

diff --cc sound/soc/codecs/adau1373.c
Simple merge

diff --cc sound/soc/codecs/alc5623.c
Simple merge

diff --cc sound/soc/codecs/alc5632.c
Simple merge

diff --cc sound/soc/codecs/cs42l52.c
Simple merge

diff --cc sound/soc/codecs/cs42l56.c
Simple merge

diff --cc sound/soc/codecs/cs42l73.c
Simple merge

diff --cc sound/soc/codecs/da7210.c
Simple merge

diff --cc sound/soc/codecs/da7213.c
Simple merge

diff --cc sound/soc/codecs/da9055.c
Simple merge

diff --cc sound/soc/codecs/max9768.c
index bd41128c6f0b2280a94ec9fccc40f53455ad6784,e1c196a4193033c2cb033c6116076c4269b7dd33,e1c196a4193033c2cb033c6116076c4269b7dd33,e1c196a4193033c2cb033c6116076c4269b7dd33,ceae776f42b2ff30ca43b5bc45dec3357e195657,e1c196a4193033c2cb033c6116076c4269b7dd33..5b82e26cd5d1ae506acebf9394629e03bfa73b12
--- 1/sound/soc/codecs/max9768.c
--- 2/sound/soc/codecs/max9768.c
--- 3/sound/soc/codecs/max9768.c
--- 4/sound/soc/codecs/max9768.c
--- 5/sound/soc/codecs/max9768.c
--- 6/sound/soc/codecs/max9768.c
+++ b/sound/soc/codecs/max9768.c
@@@@@@@ -202,11 -199,38 -199,38 -199,38 -198,38 -199,38 +201,11 @@@@@@@ static int max9768_i2c_probe(struct i2c
        i2c_set_clientdata(client, max9768);
      
        max9768->regmap = devm_regmap_init_i2c(client, &max9768_i2c_regmap_config);
 -----  if (IS_ERR(max9768->regmap)) {
 -----          err = PTR_ERR(max9768->regmap);
 -----          goto err_gpio_free;
 -----  }
    - 
    -   err = snd_soc_register_codec(&client->dev, &max9768_codec_driver, NULL, 0);
    -   if (err)
    -           goto err_gpio_free;
    - 
    -   return 0;
    - 
    -  err_gpio_free:
    -   if (gpio_is_valid(max9768->shdn_gpio))
    -           gpio_free(max9768->shdn_gpio);
    -   if (gpio_is_valid(max9768->mute_gpio))
    -           gpio_free(max9768->mute_gpio);
    - 
    -   return err;
    - }
    - 
    - static int max9768_i2c_remove(struct i2c_client *client)
    - {
    -   struct max9768 *max9768 = i2c_get_clientdata(client);
 +++++  if (IS_ERR(max9768->regmap))
 +++++          return PTR_ERR(max9768->regmap);
      
 --- -  err = snd_soc_register_codec(&client->dev, &max9768_codec_driver, NULL, 0);
 --- -  if (err)
 --- -          goto err_gpio_free;
 --- -
 --- -  return 0;
 --- -
 --- - err_gpio_free:
 --- -  if (gpio_is_valid(max9768->shdn_gpio))
 --- -          gpio_free(max9768->shdn_gpio);
 --- -  if (gpio_is_valid(max9768->mute_gpio))
 --- -          gpio_free(max9768->mute_gpio);
 --- -
 --- -  return err;
 --- -}
 --- -
 --- -static int max9768_i2c_remove(struct i2c_client *client)
 --- -{
 --- -  struct max9768 *max9768 = i2c_get_clientdata(client);
 --- -
 -----  snd_soc_unregister_codec(&client->dev);
 -----
 -----  if (gpio_is_valid(max9768->shdn_gpio))
 -----          gpio_free(max9768->shdn_gpio);
 -----  if (gpio_is_valid(max9768->mute_gpio))
 -----          gpio_free(max9768->mute_gpio);
 -----
 -----  return 0;
 +++++  return devm_snd_soc_register_component(&client->dev,
 +++++          &max9768_component_driver, NULL, 0);
      }
      
      static const struct i2c_device_id max9768_i2c_id[] = {

diff --cc sound/soc/codecs/max98088.c
Simple merge

diff --cc sound/soc/codecs/max98090.c
Simple merge

diff --cc sound/soc/codecs/max98095.c
Simple merge

diff --cc sound/soc/codecs/max9850.c
Simple merge

diff --cc sound/soc/codecs/max9877.c
Simple merge

diff --cc sound/soc/codecs/rt5631.c
Simple merge

diff --cc sound/soc/codecs/rt5640.c
Simple merge

diff --cc sound/soc/codecs/rt5645.c
index 1e70736cc970e6154291a06601de6e822f94f2ff,9ce311e088fc514bf8cde70dd120a3074f78bfe5,9ce311e088fc514bf8cde70dd120a3074f78bfe5,9ce311e088fc514bf8cde70dd120a3074f78bfe5,df27ec12fce69153ed17cb808242ccf080f3c6ac,961bd7e5877ee42c3e50f7a3e2e826a1ffab9cc8..4972bf3efa91c4849928f480bd08ebc3388a53db
--- 1/sound/soc/codecs/rt5645.c
--- 2/sound/soc/codecs/rt5645.c
--- 3/sound/soc/codecs/rt5645.c
--- 4/sound/soc/codecs/rt5645.c
--- 5/sound/soc/codecs/rt5645.c
--- 6/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@@@@@@ -2896,11 -2913,36 -2913,36 -2913,36 -2912,36 -2913,39 +2895,11 @@@@@@@ static void rt5645_jack_detect_work(str
      {
        struct rt5645_priv *rt5645 =
                container_of(work, struct rt5645_priv, jack_detect_work.work);
 -----
 -----  rt5645_irq_detection(rt5645);
 -----}
 -----
 -----static irqreturn_t rt5645_irq(int irq, void *data)
 -----{
 -----  struct rt5645_priv *rt5645 = data;
 -----
 -----  queue_delayed_work(system_power_efficient_wq,
 -----                     &rt5645->jack_detect_work, msecs_to_jiffies(250));
 -----
 -----  return IRQ_HANDLED;
 -----}
 -----
 -----static int rt5645_button_detect(struct snd_soc_codec *codec)
 -----{
 -----  int btn_type, val;
 -----
 -----  val = snd_soc_read(codec, RT5650_4BTN_IL_CMD1);
 -----  pr_debug("val=0x%x\n", val);
 -----  btn_type = val & 0xfff0;
 -----  snd_soc_write(codec, RT5650_4BTN_IL_CMD1, val);
 -----
 -----  return btn_type;
 -----}
 -----
 -----static int rt5645_irq_detection(struct rt5645_priv *rt5645)
 -----{
        int val, btn_type, gpio_state = 0, report = 0;
      
     -          return -EINVAL;
 ++++   if (!rt5645->codec)
 +++++          return;
 ++++ 
        switch (rt5645->pdata.jd_mode) {
        case 0: /* Not using rt5645 JD */
                if (rt5645->gpiod_hp_det) {

diff --cc sound/soc/codecs/rt5651.c
Simple merge

diff --cc sound/soc/codecs/rt5670.c
Simple merge

diff --cc sound/soc/codecs/rt5677.c
Simple merge

diff --cc sound/soc/codecs/sgtl5000.c
Simple merge

diff --cc sound/soc/codecs/tas2552.c
Simple merge

diff --cc sound/soc/codecs/tas5086.c
Simple merge

diff --cc sound/soc/codecs/tpa6130a2.c
Simple merge

diff --cc sound/soc/codecs/uda1380.c
Simple merge

diff --cc sound/soc/codecs/wm8737.c
Simple merge

diff --cc sound/soc/codecs/wm8753.c
Simple merge

diff --cc sound/soc/codecs/wm8961.c
Simple merge

diff --cc sound/soc/codecs/wm8962.c
Simple merge

diff --cc sound/soc/codecs/wm8990.c
Simple merge

diff --cc sound/soc/codecs/wm8991.c
Simple merge

diff --cc sound/soc/codecs/wm8993.c
Simple merge

diff --cc sound/soc/codecs/wm9081.c
Simple merge

diff --cc sound/soc/codecs/wm9090.c
Simple merge

diff --cc sound/soc/codecs/wm9713.c
Simple merge

diff --cc sound/soc/soc-topology.c
index f4e92d35316eede3b9505cd8ccb76cdededdd6b9,d0960683c4093c4303743b1e7e4f93190e11a3a5,d0960683c4093c4303743b1e7e4f93190e11a3a5,d0960683c4093c4303743b1e7e4f93190e11a3a5,d0960683c4093c4303743b1e7e4f93190e11a3a5,5690b7e7172e1bc6273756e3e7b021390963294b..69d01cd925ce28fb5fc5e798880f391ec207fff0
--- 1/sound/soc/soc-topology.c
--- 2/sound/soc/soc-topology.c
--- 3/sound/soc/soc-topology.c
--- 4/sound/soc/soc-topology.c
--- 5/sound/soc/soc-topology.c
--- 6/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@@@@@@ -528,18 -527,18 -527,18 -527,18 -527,18 -566,20 +566,20 @@@@@@@ static int soc_tplg_kcontrol_bind_io(st
        if (k->put && k->get && k->info)
                return 0;
      
-----   /* none found so try bespoke handlers */
-----   for (i = 0; i < num_bops; i++) {
+++++   /* none found so try standard kcontrol handlers */
+++++   ops = io_ops;
+++++   num_ops = ARRAY_SIZE(io_ops);
+++++   for (i = 0; i < num_ops; i++) {
      
-----           if (k->put == NULL && bops[i].id == hdr->ops.put)
-----                   k->put = bops[i].put;
-----           if (k->get == NULL && bops[i].id == hdr->ops.get)
-----                   k->get = bops[i].get;
-               if (k->info == NULL && bops[i].id == hdr->ops.info)
-                       k->info = bops[i].info;
+++++           if (k->put == NULL && ops[i].id == hdr->ops.put)
+++++                   k->put = ops[i].put;
+++++           if (k->get == NULL && ops[i].id == hdr->ops.get)
+++++                   k->get = ops[i].get;
+               if (k->info == NULL && ops[i].id == hdr->ops.info)
 ----                   k->info = bops[i].info;
+++++                   k->info = ops[i].info;
        }
      
-----   /* bespoke handlers found ? */
+++++   /* standard handlers found ? */
        if (k->put && k->get && k->info)
                return 0;
      
@@@@@@@ -580,51 -579,29 -579,29 -579,29 -579,29 -620,49 +620,49 @@@@@@@ static int soc_tplg_init_kcontrol(struc
        return 0;
      }
      
 ++++ 
 ++++ static int soc_tplg_create_tlv_db_scale(struct soc_tplg *tplg,
 ++++   struct snd_kcontrol_new *kc, struct snd_soc_tplg_tlv_dbscale *scale)
 ++++ {
 ++++   unsigned int item_len = 2 * sizeof(unsigned int);
 ++++   unsigned int *p;
 ++++ 
 ++++   p = kzalloc(item_len + 2 * sizeof(unsigned int), GFP_KERNEL);
 ++++   if (!p)
 ++++           return -ENOMEM;
 ++++ 
 ++++   p[0] = SNDRV_CTL_TLVT_DB_SCALE;
 ++++   p[1] = item_len;
 ++++   p[2] = scale->min;
 ++++   p[3] = (scale->step & TLV_DB_SCALE_MASK)
 ++++                   | (scale->mute ? TLV_DB_SCALE_MUTE : 0);
 ++++ 
 ++++   kc->tlv.p = (void *)p;
 ++++   return 0;
 ++++ }
 ++++ 
      static int soc_tplg_create_tlv(struct soc_tplg *tplg,
 ----   struct snd_kcontrol_new *kc, u32 tlv_size)
 ++++   struct snd_kcontrol_new *kc, struct snd_soc_tplg_ctl_hdr *tc)
      {
        struct snd_soc_tplg_ctl_tlv *tplg_tlv;
 ----   struct snd_ctl_tlv *tlv;
      
 ----   if (tlv_size == 0)
 ++++   if (!(tc->access & SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE))
                return 0;
      
-       if (tc->access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) {
-               kc->tlv.c = snd_soc_bytes_tlv_callback;
-       } else {
 ----   tplg_tlv = (struct snd_soc_tplg_ctl_tlv *) tplg->pos;
 ----   tplg->pos += tlv_size;
 ---- 
 ----   tlv = kzalloc(sizeof(*tlv) + tlv_size, GFP_KERNEL);
 ----   if (tlv == NULL)
 ----           return -ENOMEM;
 ---- 
 ----   dev_dbg(tplg->dev, " created TLV type %d size %d bytes\n",
 ----           tplg_tlv->numid, tplg_tlv->size);
+++++   if (!(tc->access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK)) {
 ++++           tplg_tlv = &tc->tlv;
 ++++           switch (tplg_tlv->type) {
 ++++           case SNDRV_CTL_TLVT_DB_SCALE:
 ++++                   return soc_tplg_create_tlv_db_scale(tplg, kc,
 ++++                                   &tplg_tlv->scale);
      
 ----   tlv->numid = tplg_tlv->numid;
 ----   tlv->length = tplg_tlv->size;
 ----   memcpy(tlv->tlv, tplg_tlv + 1, tplg_tlv->size);
 ----   kc->tlv.p = (void *)tlv;
 ++++           /* TODO: add support for other TLV types */
 ++++           default:
 ++++                   dev_dbg(tplg->dev, "Unsupported TLV type %d\n",
 ++++                                   tplg_tlv->type);
 ++++                   return -EINVAL;
 ++++           }
 ++++   }
      
        return 0;
      }