1 files changed, 24 insertions, 7 deletions

diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c
index 94efc01020c4..3eef0c37ba50 100644
--- a/sound/soc/qcom/lpass-apq8016.c
+++ b/sound/soc/qcom/lpass-apq8016.c
@@ -133,23 +133,36 @@ static struct snd_soc_dai_driver apq8016_lpass_cpu_dai_driver[] = {
         },
 };
 
-static int apq8016_lpass_alloc_dma_channel(struct lpass_data *drvdata)
+static int apq8016_lpass_alloc_dma_channel(struct lpass_data *drvdata,
+                                           int direction)
 {
         struct lpass_variant *v = drvdata->variant;
-        int chan = find_first_zero_bit(&drvdata->rdma_ch_bit_map,
+        int chan = 0;
+
+        if (direction == SNDRV_PCM_STREAM_PLAYBACK) {
+                chan = find_first_zero_bit(&drvdata->dma_ch_bit_map,
                                         v->rdma_channels);
 
-        if (chan >= v->rdma_channels)
-                return -EBUSY;
+                if (chan >= v->rdma_channels)
+                        return -EBUSY;
+        } else {
+                chan = find_next_zero_bit(&drvdata->dma_ch_bit_map,
+                                        v->wrdma_channel_start +
+                                        v->wrdma_channels,
+                                        v->wrdma_channel_start);
+
+                if (chan >=  v->wrdma_channel_start + v->wrdma_channels)
+                        return -EBUSY;
+        }
 
-        set_bit(chan, &drvdata->rdma_ch_bit_map);
+        set_bit(chan, &drvdata->dma_ch_bit_map);
 
         return chan;
 }
 
 static int apq8016_lpass_free_dma_channel(struct lpass_data *drvdata, int chan)
 {
-        clear_bit(chan, &drvdata->rdma_ch_bit_map);
+        clear_bit(chan, &drvdata->dma_ch_bit_map);
 
         return 0;
 }
@@ -212,7 +225,11 @@ static struct lpass_variant apq8016_data = {
         .rdma_reg_base          = 0x8400,
         .rdma_reg_stride        = 0x1000,
         .rdma_channels          = 2,
-        .rdmactl_audif_start    = 1,
+        .dmactl_audif_start     = 1,
+        .wrdma_reg_base         = 0xB000,
+        .wrdma_reg_stride       = 0x1000,
+        .wrdma_channel_start    = 5,
+        .wrdma_channels         = 2,
         .dai_driver             = apq8016_lpass_cpu_dai_driver,
         .num_dai                = ARRAY_SIZE(apq8016_lpass_cpu_dai_driver),
         .init                   = apq8016_lpass_init,