ASoC: wm_adsp: Allow up to 8 channels for voice control

[sfrench/cifs-2.6.git] / sound / soc / codecs / wm_adsp.c

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 2175dccdf38891045d89212f5f60aa18c19f2807..aeb1b8c276707a0b8cef68b9b8bb385e70e2f089 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -418,7 +418,7 @@ static const struct wm_adsp_fw_caps ctrl_caps[] = {
        {
                .id = SND_AUDIOCODEC_BESPOKE,
                .desc = {
-                       .max_ch = 1,
+                       .max_ch = 8,
                        .sample_rates = { 16000 },
                        .num_sample_rates = 1,
                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
@@ -1343,6 +1343,9 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
                        int avail = SNDRV_CTL_ELEM_ID_NAME_MAXLEN - ret - 2;
                        int skip = 0;
 
+                       if (dsp->component->name_prefix)
+                               avail -= strlen(dsp->component->name_prefix) + 1;
+
                        if (subname_len > avail)
                                skip = subname_len - avail;
 
@@ -1871,9 +1874,11 @@ static void wm_adsp_ctl_fixup_base(struct wm_adsp *dsp,
 }
 
 static void *wm_adsp_read_algs(struct wm_adsp *dsp, size_t n_algs,
+                              const struct wm_adsp_region *mem,
                               unsigned int pos, unsigned int len)
 {
        void *alg;
+       unsigned int reg;
        int ret;
        __be32 val;
 
@@ -1888,7 +1893,9 @@ static void *wm_adsp_read_algs(struct wm_adsp *dsp, size_t n_algs,
        }
 
        /* Read the terminator first to validate the length */
-       ret = regmap_raw_read(dsp->regmap, pos + len, &val, sizeof(val));
+       reg = wm_adsp_region_to_reg(mem, pos + len);
+
+       ret = regmap_raw_read(dsp->regmap, reg, &val, sizeof(val));
        if (ret != 0) {
                adsp_err(dsp, "Failed to read algorithm list end: %d\n",
                        ret);
@@ -1897,13 +1904,18 @@ static void *wm_adsp_read_algs(struct wm_adsp *dsp, size_t n_algs,
 
        if (be32_to_cpu(val) != 0xbedead)
                adsp_warn(dsp, "Algorithm list end %x 0x%x != 0xbedead\n",
-                         pos + len, be32_to_cpu(val));
+                         reg, be32_to_cpu(val));
+
+       /* Convert length from DSP words to bytes */
+       len *= sizeof(u32);
 
-       alg = kzalloc(len * 2, GFP_KERNEL | GFP_DMA);
+       alg = kzalloc(len, GFP_KERNEL | GFP_DMA);
        if (!alg)
                return ERR_PTR(-ENOMEM);
 
-       ret = regmap_raw_read(dsp->regmap, pos, alg, len * 2);
+       reg = wm_adsp_region_to_reg(mem, pos);
+
+       ret = regmap_raw_read(dsp->regmap, reg, alg, len);
        if (ret != 0) {
                adsp_err(dsp, "Failed to read algorithm list: %d\n", ret);
                kfree(alg);
@@ -2002,10 +2014,11 @@ static int wm_adsp1_setup_algs(struct wm_adsp *dsp)
        if (IS_ERR(alg_region))
                return PTR_ERR(alg_region);
 
-       pos = sizeof(adsp1_id) / 2;
-       len = (sizeof(*adsp1_alg) * n_algs) / 2;
+       /* Calculate offset and length in DSP words */
+       pos = sizeof(adsp1_id) / sizeof(u32);
+       len = (sizeof(*adsp1_alg) * n_algs) / sizeof(u32);
 
-       adsp1_alg = wm_adsp_read_algs(dsp, n_algs, mem->base + pos, len);
+       adsp1_alg = wm_adsp_read_algs(dsp, n_algs, mem, pos, len);
        if (IS_ERR(adsp1_alg))
                return PTR_ERR(adsp1_alg);
 
@@ -2113,10 +2126,11 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
        if (IS_ERR(alg_region))
                return PTR_ERR(alg_region);
 
-       pos = sizeof(adsp2_id) / 2;
-       len = (sizeof(*adsp2_alg) * n_algs) / 2;
+       /* Calculate offset and length in DSP words */
+       pos = sizeof(adsp2_id) / sizeof(u32);
+       len = (sizeof(*adsp2_alg) * n_algs) / sizeof(u32);
 
-       adsp2_alg = wm_adsp_read_algs(dsp, n_algs, mem->base + pos, len);
+       adsp2_alg = wm_adsp_read_algs(dsp, n_algs, mem, pos, len);
        if (IS_ERR(adsp2_alg))
                return PTR_ERR(adsp2_alg);