ASoC: dwc: don't assign addr_width for dt configs

For proper DMA operation addr_width must corresponds with audio format
(S16, S24, S32, etc). Proper bus width calculations is performed by
snd_hwparams_to_dma_slave_config(). So drop wrong addr_width asignment
for dt configs and let snd_hwparams_to_dma_slave_config() do the job.

Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
Link: https://lore.kernel.org/r/20230613191552.724748-1-fido_max@inbox.ru
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c
index 02b9894e99a7022179e3bb962ae25ed58d491ada..97d652f0e84d362a49f2402ed848e1efe2ba99af 100644 (file)
--- a/sound/soc/dwc/dwc-i2s.c
+++ b/sound/soc/dwc/dwc-i2s.c
@@ -593,13 +593,9 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev,
        u32 comp1 = i2s_read_reg(dev->i2s_base, I2S_COMP_PARAM_1);
        u32 comp2 = i2s_read_reg(dev->i2s_base, I2S_COMP_PARAM_2);
        u32 fifo_depth = 1 << (1 + COMP1_FIFO_DEPTH_GLOBAL(comp1));
-       u32 idx = COMP1_APB_DATA_WIDTH(comp1);
        u32 idx2;
        int ret;
 
-       if (WARN_ON(idx >= ARRAY_SIZE(bus_widths)))
-               return -EINVAL;
-
        ret = dw_configure_dai(dev, dw_i2s_dai, SNDRV_PCM_RATE_8000_192000);
        if (ret < 0)
                return ret;
@@ -609,7 +605,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.fifo_size = fifo_depth *
                        (fifo_width[idx2]) >> 8;
                dev->play_dma_data.dt.maxburst = 16;
@@ -619,7 +614,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.fifo_size = fifo_depth *
                        (fifo_width[idx2] >> 8);
                dev->capture_dma_data.dt.maxburst = 16;