Asoc: qcom: lpass:Update lpaif_dmactl members order

Update the lpaif_dmactl struct members order to match
HDMI reg map members sequence. Separate Interface reg map
as it is used for I2S control but not for HDMI control,
to make use of bulk API, which makes code more readable.

Signed-off-by: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Srinivasa Rao <srivasam@codeaurora.org>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/1602134223-2562-5-git-send-email-srivasam@codeaurora.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
index e7cf4e595ebdd02db5ee54df083cbab70683befc..db0d959b16190e69943c68c4d12fa211641e987b 100644 (file)
--- a/sound/soc/qcom/lpass-platform.c
+++ b/sound/soc/qcom/lpass-platform.c
@@ -71,13 +71,13 @@ static int lpass_platform_alloc_dmactl_fields(struct device *dev,
        rd_dmactl = drvdata->rd_dmactl;
        wr_dmactl = drvdata->wr_dmactl;
 
-       rval = devm_regmap_field_bulk_alloc(dev, map, &rd_dmactl->bursten,
-                                           &v->rdma_bursten, 6);
+       rval = devm_regmap_field_bulk_alloc(dev, map, &rd_dmactl->intf,
+                                           &v->rdma_intf, 6);
        if (rval)
                return rval;
 
-       return devm_regmap_field_bulk_alloc(dev, map, &wr_dmactl->bursten,
-                                           &v->wrdma_bursten, 6);
+       return devm_regmap_field_bulk_alloc(dev, map, &wr_dmactl->intf,
+                                           &v->wrdma_intf, 6);
 }
 
 static int lpass_platform_pcmops_open(struct snd_soc_component *component,

diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h
index 51c9991a0edf4b1af68647683695d563c7456774..7089d4cdf5e9ea5d4a963434d6691a8d229f84ab 100644 (file)
--- a/sound/soc/qcom/lpass.h
+++ b/sound/soc/qcom/lpass.h
@@ -31,9 +31,9 @@ struct lpaif_i2sctl {
 
 
 struct lpaif_dmactl {
+       struct regmap_field *intf;
        struct regmap_field *bursten;
        struct regmap_field *wpscnt;
-       struct regmap_field *intf;
        struct regmap_field *fifowm;
        struct regmap_field *enable;
        struct regmap_field *dyncclk;
@@ -110,17 +110,17 @@ struct lpass_variant {
        struct reg_field bitwidth;
 
        /* RD_DMA Register fields */
+       struct reg_field rdma_intf;
        struct reg_field rdma_bursten;
        struct reg_field rdma_wpscnt;
-       struct reg_field rdma_intf;
        struct reg_field rdma_fifowm;
        struct reg_field rdma_enable;
        struct reg_field rdma_dyncclk;
 
        /* WR_DMA Register fields */
+       struct reg_field wrdma_intf;
        struct reg_field wrdma_bursten;
        struct reg_field wrdma_wpscnt;
-       struct reg_field wrdma_intf;
        struct reg_field wrdma_fifowm;
        struct reg_field wrdma_enable;
        struct reg_field wrdma_dyncclk;