The patchset clean up "fsl,imx8qm-adma" compatible string.
For the details, please check the patch commit log.
---
Changes for v3:
1. add more description for dt-bindings patch commit message.
2. remove the unused compatible string "fsl,imx8qm-adma" from allOf property.
Changes for v2:
1. Change the patchset subject.
2. Add bindings update.
Joy Zou (2):
dmaengine: fsl-edma: Remove unused "fsl,imx8qm-adma" compatible string
dma: dt-bindings: fsl-edma: clean up unused "fsl,imx8qm-adma"
compatible string
.../devicetree/bindings/dma/fsl,edma.yaml | 2 --
drivers/dma/fsl-edma-common.c | 16 ++++------------
drivers/dma/fsl-edma-main.c | 8 --------
3 files changed, 4 insertions(+), 22 deletions(-)
--
2.37.1
The eDMA hardware issue only exist imx8QM A0. A0 never mass production.
So remove the workaround safely.
Signed-off-by: Joy Zou <[email protected]>
---
Changes for v2:
1. Change the subject.
---
drivers/dma/fsl-edma-common.c | 16 ++++------------
drivers/dma/fsl-edma-main.c | 8 --------
2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index f9144b015439..ed93e01282d5 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -75,18 +75,10 @@ static void fsl_edma3_enable_request(struct fsl_edma_chan *fsl_chan)
flags = fsl_edma_drvflags(fsl_chan);
val = edma_readl_chreg(fsl_chan, ch_sbr);
- /* Remote/local swapped wrongly on iMX8 QM Audio edma */
- if (flags & FSL_EDMA_DRV_QUIRK_SWAPPED) {
- if (!fsl_chan->is_rxchan)
- val |= EDMA_V3_CH_SBR_RD;
- else
- val |= EDMA_V3_CH_SBR_WR;
- } else {
- if (fsl_chan->is_rxchan)
- val |= EDMA_V3_CH_SBR_RD;
- else
- val |= EDMA_V3_CH_SBR_WR;
- }
+ if (fsl_chan->is_rxchan)
+ val |= EDMA_V3_CH_SBR_RD;
+ else
+ val |= EDMA_V3_CH_SBR_WR;
if (fsl_chan->is_remote)
val &= ~(EDMA_V3_CH_SBR_RD | EDMA_V3_CH_SBR_WR);
diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index 755a3dc3b0a7..b06fa147d6ba 100644
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -349,13 +349,6 @@ static struct fsl_edma_drvdata imx8qm_data = {
.setup_irq = fsl_edma3_irq_init,
};
-static struct fsl_edma_drvdata imx8qm_audio_data = {
- .flags = FSL_EDMA_DRV_QUIRK_SWAPPED | FSL_EDMA_DRV_HAS_PD | FSL_EDMA_DRV_EDMA3,
- .chreg_space_sz = 0x10000,
- .chreg_off = 0x10000,
- .setup_irq = fsl_edma3_irq_init,
-};
-
static struct fsl_edma_drvdata imx8ulp_data = {
.flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_CHCLK | FSL_EDMA_DRV_HAS_DMACLK |
FSL_EDMA_DRV_EDMA3,
@@ -397,7 +390,6 @@ static const struct of_device_id fsl_edma_dt_ids[] = {
{ .compatible = "fsl,ls1028a-edma", .data = &ls1028a_data},
{ .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data},
{ .compatible = "fsl,imx8qm-edma", .data = &imx8qm_data},
- { .compatible = "fsl,imx8qm-adma", .data = &imx8qm_audio_data},
{ .compatible = "fsl,imx8ulp-edma", .data = &imx8ulp_data},
{ .compatible = "fsl,imx93-edma3", .data = &imx93_data3},
{ .compatible = "fsl,imx93-edma4", .data = &imx93_data4},
--
2.37.1
The eDMA hardware issue only exist imx8QM A0. A0 never mass production.
The compatible string "fsl,imx8qm-adma" is unused. So remove the
workaround safely.
Signed-off-by: Joy Zou <[email protected]>
---
Changes for v3:
1. modify the commit message.
2. remove the unused compatible string "fsl,imx8qm-adma" from allOf property.
---
Documentation/devicetree/bindings/dma/fsl,edma.yaml | 2 --
1 file changed, 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/dma/fsl,edma.yaml b/Documentation/devicetree/bindings/dma/fsl,edma.yaml
index 825f4715499e..cf97ea86a7a2 100644
--- a/Documentation/devicetree/bindings/dma/fsl,edma.yaml
+++ b/Documentation/devicetree/bindings/dma/fsl,edma.yaml
@@ -21,7 +21,6 @@ properties:
- enum:
- fsl,vf610-edma
- fsl,imx7ulp-edma
- - fsl,imx8qm-adma
- fsl,imx8qm-edma
- fsl,imx8ulp-edma
- fsl,imx93-edma3
@@ -92,7 +91,6 @@ allOf:
compatible:
contains:
enum:
- - fsl,imx8qm-adma
- fsl,imx8qm-edma
- fsl,imx93-edma3
- fsl,imx93-edma4
--
2.37.1
On Fri, Apr 12, 2024 at 11:04:36AM +0800, Joy Zou wrote:
> The eDMA hardware issue only exist imx8QM A0. A0 never mass production.
> The compatible string "fsl,imx8qm-adma" is unused. So remove the
> workaround safely.
You missed change subject:
dt-bindings: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string
dt-bindings should be first patch, then driver code.
I suggest use the same words, "clean up" or "Remove". keep consistent for
both patches
Frank
>
> Signed-off-by: Joy Zou <[email protected]>
> ---
> Changes for v3:
> 1. modify the commit message.
> 2. remove the unused compatible string "fsl,imx8qm-adma" from allOf property.
> ---
> Documentation/devicetree/bindings/dma/fsl,edma.yaml | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/dma/fsl,edma.yaml b/Documentation/devicetree/bindings/dma/fsl,edma.yaml
> index 825f4715499e..cf97ea86a7a2 100644
> --- a/Documentation/devicetree/bindings/dma/fsl,edma.yaml
> +++ b/Documentation/devicetree/bindings/dma/fsl,edma.yaml
> @@ -21,7 +21,6 @@ properties:
> - enum:
> - fsl,vf610-edma
> - fsl,imx7ulp-edma
> - - fsl,imx8qm-adma
> - fsl,imx8qm-edma
> - fsl,imx8ulp-edma
> - fsl,imx93-edma3
> @@ -92,7 +91,6 @@ allOf:
> compatible:
> contains:
> enum:
> - - fsl,imx8qm-adma
> - fsl,imx8qm-edma
> - fsl,imx93-edma3
> - fsl,imx93-edma4
> --
> 2.37.1
>
> -----Original Message-----
> From: Frank Li <[email protected]>
> Sent: 2024??4??12?? 11:07
> To: Joy Zou <[email protected]>
> Cc: Peng Fan <[email protected]>; [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]
> Subject: Re: [PATCH v3 2/2] dma: dt-bindings: fsl-edma: clean up unused
> "fsl,imx8qm-adma" compatible string
>
> On Fri, Apr 12, 2024 at 11:04:36AM +0800, Joy Zou wrote:
> > The eDMA hardware issue only exist imx8QM A0. A0 never mass
> production.
> > The compatible string "fsl,imx8qm-adma" is unused. So remove the
> > workaround safely.
>
>
> You missed change subject:
>
> dt-bindings: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string
>
> dt-bindings should be first patch, then driver code.
>
> I suggest use the same words, "clean up" or "Remove". keep consistent for
> both patches
Thanks your comments!
Yeah, sorry for forgetting to change it. Will change in next version.
BR
Joy Zou
>
> Frank
>