ASoC: jz4740-i2s: Remove manual DMA peripheral ID assignment
authorLars-Peter Clausen <lars@metafoo.de>
Fri, 23 Oct 2020 09:23:46 +0000 (11:23 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 26 Oct 2020 18:37:01 +0000 (18:37 +0000)
All platforms that use the jz4740-i2s driver have been switched to
devicetree for a while now and the assignment of the DMA peripheral ID
is done in the devicetree.

It is no longer necessary to manually assign the peripheral ID in the
driver, so remove that. The DMA driver does not even look at the value
assigned in the driver anymore and always uses the value provided by the
devicetree.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20201023092346.5777-1-lars@metafoo.de
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/jz4740/jz4740-i2s.c

index c7bd201..e8bc7ca 100644 (file)
@@ -26,9 +26,6 @@
 
 #include "jz4740-i2s.h"
 
-#define JZ4740_DMA_TYPE_AIC_TRANSMIT 24
-#define JZ4740_DMA_TYPE_AIC_RECEIVE 25
-
 #define JZ_REG_AIC_CONF                0x00
 #define JZ_REG_AIC_CTRL                0x04
 #define JZ_REG_AIC_I2S_FMT     0x10
@@ -377,13 +374,11 @@ static void jz4740_i2c_init_pcm_config(struct jz4740_i2s *i2s)
        /* Playback */
        dma_data = &i2s->playback_dma_data;
        dma_data->maxburst = 16;
-       dma_data->slave_id = JZ4740_DMA_TYPE_AIC_TRANSMIT;
        dma_data->addr = i2s->phys_base + JZ_REG_AIC_FIFO;
 
        /* Capture */
        dma_data = &i2s->capture_dma_data;
        dma_data->maxburst = 16;
-       dma_data->slave_id = JZ4740_DMA_TYPE_AIC_RECEIVE;
        dma_data->addr = i2s->phys_base + JZ_REG_AIC_FIFO;
 }