Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

dmaengine: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string

The eDMA hardware issue only exist imx8QM A0. A0 never mass production.
So remove the workaround safely.

Signed-off-by: Joy Zou <joy.zou@nxp.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20240424064508.1886764-2-joy.zou@nxp.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Joy Zou and committed by
Vinod Koul
77584368 e83cd59d

+4 -22
+4 -12
drivers/dma/fsl-edma-common.c
··· 76 76 77 77 flags = fsl_edma_drvflags(fsl_chan); 78 78 val = edma_readl_chreg(fsl_chan, ch_sbr); 79 - /* Remote/local swapped wrongly on iMX8 QM Audio edma */ 80 - if (flags & FSL_EDMA_DRV_QUIRK_SWAPPED) { 81 - if (!fsl_chan->is_rxchan) 82 - val |= EDMA_V3_CH_SBR_RD; 83 - else 84 - val |= EDMA_V3_CH_SBR_WR; 85 - } else { 86 - if (fsl_chan->is_rxchan) 87 - val |= EDMA_V3_CH_SBR_RD; 88 - else 89 - val |= EDMA_V3_CH_SBR_WR; 90 - } 79 + if (fsl_chan->is_rxchan) 80 + val |= EDMA_V3_CH_SBR_RD; 81 + else 82 + val |= EDMA_V3_CH_SBR_WR; 91 83 92 84 if (fsl_chan->is_remote) 93 85 val &= ~(EDMA_V3_CH_SBR_RD | EDMA_V3_CH_SBR_WR);
-2
drivers/dma/fsl-edma-common.h
··· 194 194 #define FSL_EDMA_DRV_HAS_PD BIT(5) 195 195 #define FSL_EDMA_DRV_HAS_CHCLK BIT(6) 196 196 #define FSL_EDMA_DRV_HAS_CHMUX BIT(7) 197 - /* imx8 QM audio edma remote local swapped */ 198 - #define FSL_EDMA_DRV_QUIRK_SWAPPED BIT(8) 199 197 /* control and status register is in tcd address space, edma3 reg layout */ 200 198 #define FSL_EDMA_DRV_SPLIT_REG BIT(9) 201 199 #define FSL_EDMA_DRV_BUS_8BYTE BIT(10)
-8
drivers/dma/fsl-edma-main.c
··· 348 348 .setup_irq = fsl_edma3_irq_init, 349 349 }; 350 350 351 - static struct fsl_edma_drvdata imx8qm_audio_data = { 352 - .flags = FSL_EDMA_DRV_QUIRK_SWAPPED | FSL_EDMA_DRV_HAS_PD | FSL_EDMA_DRV_EDMA3, 353 - .chreg_space_sz = 0x10000, 354 - .chreg_off = 0x10000, 355 - .setup_irq = fsl_edma3_irq_init, 356 - }; 357 - 358 351 static struct fsl_edma_drvdata imx8ulp_data = { 359 352 .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_CHCLK | FSL_EDMA_DRV_HAS_DMACLK | 360 353 FSL_EDMA_DRV_EDMA3, ··· 389 396 { .compatible = "fsl,ls1028a-edma", .data = &ls1028a_data}, 390 397 { .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data}, 391 398 { .compatible = "fsl,imx8qm-edma", .data = &imx8qm_data}, 392 - { .compatible = "fsl,imx8qm-adma", .data = &imx8qm_audio_data}, 393 399 { .compatible = "fsl,imx8ulp-edma", .data = &imx8ulp_data}, 394 400 { .compatible = "fsl,imx93-edma3", .data = &imx93_data3}, 395 401 { .compatible = "fsl,imx93-edma4", .data = &imx93_data4},