Merge tag 'devprop-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / sound / soc / codecs / wm_adsp.c

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 9b8bb7b..2a9b610 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -599,6 +599,9 @@ struct wm_coeff_ctl_ops {
 struct wm_coeff_ctl {
        const char *name;
        const char *fw_name;
+       /* Subname is needed to match with firmware */
+       const char *subname;
+       unsigned int subname_len;
        struct wm_adsp_alg_region alg_region;
        struct wm_coeff_ctl_ops ops;
        struct wm_adsp *dsp;
@@ -1399,6 +1402,7 @@ static void wm_adsp_free_ctl_blk(struct wm_coeff_ctl *ctl)
 {
        kfree(ctl->cache);
        kfree(ctl->name);
+       kfree(ctl->subname);
        kfree(ctl);
 }
 
@@ -1472,6 +1476,15 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
                ret = -ENOMEM;
                goto err_ctl;
        }
+       if (subname) {
+               ctl->subname_len = subname_len;
+               ctl->subname = kmemdup(subname,
+                                      strlen(subname) + 1, GFP_KERNEL);
+               if (!ctl->subname) {
+                       ret = -ENOMEM;
+                       goto err_ctl_name;
+               }
+       }
        ctl->enabled = 1;
        ctl->set = 0;
        ctl->ops.xget = wm_coeff_get;
@@ -1485,7 +1498,7 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
        ctl->cache = kzalloc(ctl->len, GFP_KERNEL);
        if (!ctl->cache) {
                ret = -ENOMEM;
-               goto err_ctl_name;
+               goto err_ctl_subname;
        }
 
        list_add(&ctl->list, &dsp->ctl_list);
@@ -1508,6 +1521,8 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
 
 err_ctl_cache:
        kfree(ctl->cache);
+err_ctl_subname:
+       kfree(ctl->subname);
 err_ctl_name:
        kfree(ctl->name);
 err_ctl:
@@ -1995,6 +2010,70 @@ out:
        return ret;
 }
 
+/*
+ * Find wm_coeff_ctl with input name as its subname
+ * If not found, return NULL
+ */
+static struct wm_coeff_ctl *wm_adsp_get_ctl(struct wm_adsp *dsp,
+                                            const char *name, int type,
+                                            unsigned int alg)
+{
+       struct wm_coeff_ctl *pos, *rslt = NULL;
+
+       list_for_each_entry(pos, &dsp->ctl_list, list) {
+               if (!pos->subname)
+                       continue;
+               if (strncmp(pos->subname, name, pos->subname_len) == 0 &&
+                               pos->alg_region.alg == alg &&
+                               pos->alg_region.type == type) {
+                       rslt = pos;
+                       break;
+               }
+       }
+
+       return rslt;
+}
+
+int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type,
+                     unsigned int alg, void *buf, size_t len)
+{
+       struct wm_coeff_ctl *ctl;
+       struct snd_kcontrol *kcontrol;
+       int ret;
+
+       ctl = wm_adsp_get_ctl(dsp, name, type, alg);
+       if (!ctl)
+               return -EINVAL;
+
+       if (len > ctl->len)
+               return -EINVAL;
+
+       ret = wm_coeff_write_control(ctl, buf, len);
+
+       kcontrol = snd_soc_card_get_kcontrol(dsp->component->card, ctl->name);
+       snd_ctl_notify(dsp->component->card->snd_card,
+                      SNDRV_CTL_EVENT_MASK_VALUE, &kcontrol->id);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(wm_adsp_write_ctl);
+
+int wm_adsp_read_ctl(struct wm_adsp *dsp, const char *name, int type,
+                    unsigned int alg, void *buf, size_t len)
+{
+       struct wm_coeff_ctl *ctl;
+
+       ctl = wm_adsp_get_ctl(dsp, name, type, alg);
+       if (!ctl)
+               return -EINVAL;
+
+       if (len > ctl->len)
+               return -EINVAL;
+
+       return wm_coeff_read_control(ctl, buf, len);
+}
+EXPORT_SYMBOL_GPL(wm_adsp_read_ctl);
+
 static void wm_adsp_ctl_fixup_base(struct wm_adsp *dsp,
                                  const struct wm_adsp_alg_region *alg_region)
 {