[openwrt/openwrt] ramips: 6.1: dai_dma: drop dma_data->slave_id in mt7620 support patch

[LEDE Commits]

nick pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/31b3e61d77eccf62b13340013eae6aea40940444

commit 31b3e61d77eccf62b13340013eae6aea40940444
Author: Nick Hainke <vincent at systemli.org>
AuthorDate: Thu Feb 8 14:15:40 2024 +0100

    ramips: 6.1: dai_dma: drop dma_data->slave_id in mt7620 support patch
    
    Upstream dropped slave_id in dai_dma [0]. So drop it also in the mt7620
    support patch.
    
    Fixes errors in the form of:
       sound/soc/ralink/ralink-i2s.c: In function 'ralink_i2s_init_dma_data':
      sound/soc/ralink/ralink-i2s.c:452:17: error: 'struct snd_dmaengine_dai_dma_data' has no member named 'slave_id'
        452 |         dma_data->slave_id = i2s->txdma_req;
            |                 ^~
      sound/soc/ralink/ralink-i2s.c:462:17: error: 'struct snd_dmaengine_dai_dma_data' has no member named 'slave_id'
        462 |         dma_data->slave_id = i2s->rxdma_req;
            |                 ^~
    
    [0] - https://lore.kernel.org/r/20211122222203.4103644-3-arnd@kernel.org
    
    Signed-off-by: Nick Hainke <vincent at systemli.org>
---
 target/linux/ramips/patches-6.1/835-asoc-add-mt7620-support.patch | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/target/linux/ramips/patches-6.1/835-asoc-add-mt7620-support.patch b/target/linux/ramips/patches-6.1/835-asoc-add-mt7620-support.patch
index 551fdd8b3c..ef202ca474 100644
--- a/target/linux/ramips/patches-6.1/835-asoc-add-mt7620-support.patch
+++ b/target/linux/ramips/patches-6.1/835-asoc-add-mt7620-support.patch
@@ -60,7 +60,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +obj-$(CONFIG_SND_RALINK_SOC_I2S) += snd-soc-ralink-i2s.o
 --- /dev/null
 +++ b/sound/soc/ralink/ralink-i2s.c
-@@ -0,0 +1,970 @@
+@@ -0,0 +1,968 @@
 +/*
 + *  Copyright (C) 2010, Lars-Peter Clausen <lars at metafoo.de>
 + *  Copyright (C) 2016 Michael Lee <igvtee at gmail.com>
@@ -512,7 +512,6 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	dma_data->addr = res->start + I2S_REG_WREG;
 +	dma_data->addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 +	dma_data->maxburst = 1;
-+	dma_data->slave_id = i2s->txdma_req;
 +
 +	if (i2s->flags & RALINK_FLAGS_TXONLY)
 +		return;
@@ -522,7 +521,6 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	dma_data->addr = res->start + I2S_REG_RREG;
 +	dma_data->addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 +	dma_data->maxburst = 1;
-+	dma_data->slave_id = i2s->rxdma_req;
 +}
 +
 +static int ralink_i2s_dai_probe(struct snd_soc_dai *dai)