| Message ID | 20201023092346.5777-1-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 81dde99f1ac64e27290990c67439b49ecc1f7c29 |
| Headers | show |
| Series | ASoC: jz4740-i2s: Remove manual DMA peripheral ID assignment | expand |
Le ven. 23 oct. 2020 à 11:23, Lars-Peter Clausen <lars@metafoo.de> a écrit : > 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> Cheers, -Paul > --- > sound/soc/jz4740/jz4740-i2s.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/sound/soc/jz4740/jz4740-i2s.c > b/sound/soc/jz4740/jz4740-i2s.c > index c7bd20104b20..e8bc7ca5ee5e 100644 > --- a/sound/soc/jz4740/jz4740-i2s.c > +++ b/sound/soc/jz4740/jz4740-i2s.c > @@ -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; > } > > -- > 2.20.1 >
On Fri, 23 Oct 2020 11:23:46 +0200, Lars-Peter Clausen wrote: > 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. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: jz4740-i2s: Remove manual DMA peripheral ID assignment commit: 81dde99f1ac64e27290990c67439b49ecc1f7c29 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index c7bd20104b20..e8bc7ca5ee5e 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -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; }
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> --- sound/soc/jz4740/jz4740-i2s.c | 5 ----- 1 file changed, 5 deletions(-)