Unverified Commit 81dde99f authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: jz4740-i2s: Remove manual DMA peripheral ID assignment 



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: default avatarLars-Peter Clausen <lars@metafoo.de>
Reviewed-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20201023092346.5777-1-lars@metafoo.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fc7f6a05

sound/soc/jz4740/jz4740-i2s.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -26,9 +26,6 @@ 




#include "jz4740-i2s.h"

#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_CONF		0x00

#define JZ_REG_AIC_CTRL		0x04

#define JZ_REG_AIC_CTRL		0x04

#define JZ_REG_AIC_I2S_FMT	0x10

#define JZ_REG_AIC_I2S_FMT	0x10
@@ -377,13 +374,11 @@ static void jz4740_i2c_init_pcm_config(struct jz4740_i2s *i2s) 
	/* Playback */

	/* Playback */

	dma_data = &i2s->playback_dma_data;

	dma_data = &i2s->playback_dma_data;

	dma_data->maxburst = 16;

	dma_data->maxburst = 16;

	dma_data->slave_id = JZ4740_DMA_TYPE_AIC_TRANSMIT;

	dma_data->addr = i2s->phys_base + JZ_REG_AIC_FIFO;

	dma_data->addr = i2s->phys_base + JZ_REG_AIC_FIFO;





	/* Capture */

	/* Capture */

	dma_data = &i2s->capture_dma_data;

	dma_data = &i2s->capture_dma_data;

	dma_data->maxburst = 16;

	dma_data->maxburst = 16;

	dma_data->slave_id = JZ4740_DMA_TYPE_AIC_RECEIVE;

	dma_data->addr = i2s->phys_base + JZ_REG_AIC_FIFO;

	dma_data->addr = i2s->phys_base + JZ_REG_AIC_FIFO;

}

}