Skip to content

Commit 7758436

Browse files
1991Joyzouvinodkoul
authored andcommitted
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 <[email protected]> Reviewed-by: Frank Li <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent e83cd59 commit 7758436

File tree

3 files changed

+4
-22
lines changed

3 files changed

+4
-22
lines changed

drivers/dma/fsl-edma-common.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,10 @@ static void fsl_edma3_enable_request(struct fsl_edma_chan *fsl_chan)
7676

7777
flags = fsl_edma_drvflags(fsl_chan);
7878
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;
9183

9284
if (fsl_chan->is_remote)
9385
val &= ~(EDMA_V3_CH_SBR_RD | EDMA_V3_CH_SBR_WR);

drivers/dma/fsl-edma-common.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,6 @@ struct fsl_edma_desc {
194194
#define FSL_EDMA_DRV_HAS_PD BIT(5)
195195
#define FSL_EDMA_DRV_HAS_CHCLK BIT(6)
196196
#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)
199197
/* control and status register is in tcd address space, edma3 reg layout */
200198
#define FSL_EDMA_DRV_SPLIT_REG BIT(9)
201199
#define FSL_EDMA_DRV_BUS_8BYTE BIT(10)

drivers/dma/fsl-edma-main.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -348,13 +348,6 @@ static struct fsl_edma_drvdata imx8qm_data = {
348348
.setup_irq = fsl_edma3_irq_init,
349349
};
350350

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-
358351
static struct fsl_edma_drvdata imx8ulp_data = {
359352
.flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_CHCLK | FSL_EDMA_DRV_HAS_DMACLK |
360353
FSL_EDMA_DRV_EDMA3,
@@ -396,7 +389,6 @@ static const struct of_device_id fsl_edma_dt_ids[] = {
396389
{ .compatible = "fsl,ls1028a-edma", .data = &ls1028a_data},
397390
{ .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data},
398391
{ .compatible = "fsl,imx8qm-edma", .data = &imx8qm_data},
399-
{ .compatible = "fsl,imx8qm-adma", .data = &imx8qm_audio_data},
400392
{ .compatible = "fsl,imx8ulp-edma", .data = &imx8ulp_data},
401393
{ .compatible = "fsl,imx93-edma3", .data = &imx93_data3},
402394
{ .compatible = "fsl,imx93-edma4", .data = &imx93_data4},

0 commit comments

Comments
 (0)