Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35397ede authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ASoC: dwc: Drop DMA channel names assignment 



The dw_configure_dai_by_dt() function and further dev->{play,capture}
_dma_data.dt data structures seem to be used in this driver only in case
of a system using devicetree, thus chan_name assignments have no effect
since they will be ignored in dmaengine_pcm_request_chan_of() call and
will be substituted with values taken form dmaengine_pcm_dma_channel_names[]
table ("tx", "rx").

Also there is no any "TX", "RX" dma-names entries in arch/arm/boot/dts,
only lower case "tx", "rx" seem to be used.

Lastly, this driver doesn't set SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME
flag when registering a dmaengine PCM to indicate the chan_name should be
used.

My intention is to eventually remove the struct snd_dmaengine_dai_dma_data
chan_name field as there is also a chan_names[] field in struct
snd_dmaengine_pcm_config which can be used for same purpose.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 29b4817d

sound/soc/dwc/designware_i2s.c

+0 −2
Original line number Diff line number Diff line
@@ -577,7 +577,6 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, 
		dev->capability |= DWC_I2S_PLAY;

		dev->play_dma_data.dt.addr = res->start + I2S_TXDMA;

		dev->play_dma_data.dt.addr_width = bus_widths[idx];

		dev->play_dma_data.dt.chan_name = "TX";

		dev->play_dma_data.dt.fifo_size = fifo_depth *

			(fifo_width[idx2]) >> 8;

		dev->play_dma_data.dt.maxburst = 16;
@@ -588,7 +587,6 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, 
		dev->capability |= DWC_I2S_RECORD;

		dev->capture_dma_data.dt.addr = res->start + I2S_RXDMA;

		dev->capture_dma_data.dt.addr_width = bus_widths[idx];

		dev->capture_dma_data.dt.chan_name = "RX";

		dev->capture_dma_data.dt.fifo_size = fifo_depth *

			(fifo_width[idx2] >> 8);

		dev->capture_dma_data.dt.maxburst = 16;