ASoC: wm_adsp: Rename memory fields in wm_adsp_buffer

The wm_adsp_buffer struct is the control header of a circular
buffer used to transfer data from the firmware over the
control interface to an ALSA compressed stream.

The original names of the fields pointing to the data buffer
were based on ADSP2V2 memory layout where they correspond to
{XM, XM, YM}. But this circular buffer could be used on other
types of DSP core that have different memory region types.
Also the names and description of the size fields were not
very clear. The field names and descriptions have been changed
to be generic and not imply any particular memory types.

This patch updates the wm_adsp driver to the new field names.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index f61656070225bf643b3223730e12dd7822c23b89..7ae10c632614365187a8799553d6be90261af2e4 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -311,12 +311,12 @@ struct wm_adsp_alg_xm_struct {
 };
 
 struct wm_adsp_buffer {
-       __be32 X_buf_base;              /* XM base addr of first X area */
-       __be32 X_buf_size;              /* Size of 1st X area in words */
-       __be32 X_buf_base2;             /* XM base addr of 2nd X area */
-       __be32 X_buf_brk;               /* Total X size in words */
-       __be32 Y_buf_base;              /* YM base addr of Y area */
-       __be32 wrap;                    /* Total size X and Y in words */
+       __be32 buf1_base;               /* Base addr of first buffer area */
+       __be32 buf1_size;               /* Size of buf1 area in DSP words */
+       __be32 buf2_base;               /* Base addr of 2nd buffer area */
+       __be32 buf1_buf2_size;          /* Size of buf1+buf2 in DSP words */
+       __be32 buf3_base;               /* Base addr of buf3 area */
+       __be32 buf_total_size;          /* Size of buf1+buf2+buf3 in DSP words */
        __be32 high_water_mark;         /* Point at which IRQ is asserted */
        __be32 irq_count;               /* bits 1-31 count IRQ assertions */
        __be32 irq_ack;                 /* acked IRQ count, bit 0 enables IRQ */
@@ -393,18 +393,18 @@ struct wm_adsp_buffer_region_def {
 static const struct wm_adsp_buffer_region_def default_regions[] = {
        {
                .mem_type = WMFW_ADSP2_XM,
-               .base_offset = HOST_BUFFER_FIELD(X_buf_base),
-               .size_offset = HOST_BUFFER_FIELD(X_buf_size),
+               .base_offset = HOST_BUFFER_FIELD(buf1_base),
+               .size_offset = HOST_BUFFER_FIELD(buf1_size),
        },
        {
                .mem_type = WMFW_ADSP2_XM,
-               .base_offset = HOST_BUFFER_FIELD(X_buf_base2),
-               .size_offset = HOST_BUFFER_FIELD(X_buf_brk),
+               .base_offset = HOST_BUFFER_FIELD(buf2_base),
+               .size_offset = HOST_BUFFER_FIELD(buf1_buf2_size),
        },
        {
                .mem_type = WMFW_ADSP2_YM,
-               .base_offset = HOST_BUFFER_FIELD(Y_buf_base),
-               .size_offset = HOST_BUFFER_FIELD(wrap),
+               .base_offset = HOST_BUFFER_FIELD(buf3_base),
+               .size_offset = HOST_BUFFER_FIELD(buf_total_size),
        },
 };