[PATCH v4 0/2] clean up unused "fsl,imx8qm-adma" compatible string

[PATCH v4 0/2] clean up unused "fsl,imx8qm-adma" compatible string

[Joy Zou]

The patchset clean up "fsl,imx8qm-adma" compatible string.
For the details, please check the patch commit log.

---
Changes for v4:
1. change patch subject.

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: clean up unused "fsl,imx8qm-adma" compatible
    string
  dt-bindings: fsl-dma: 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

[PATCH v4 1/2] dmaengine: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string

[Joy Zou]

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>
---
Changes for v4:
1.change the subject to keep consistent with the patchset.

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

[PATCH v4 2/2] dt-bindings: fsl-dma: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string

[Joy Zou]

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 <joy.zou@nxp.com>
---
Changes for v4:
1. adjust the subject to keep consistent with existing patches.

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

Re: [PATCH v4 1/2] dmaengine: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string

[Frank Li]

On Wed, Apr 17, 2024 at 11:26:41AM +0800, Joy Zou wrote:
> 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>
> ---
> Changes for v4:
> 1.change the subject to keep consistent with the patchset.
> 
> 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) {

You forget remove FSL_EDMA_DRV_QUIRK_SWAPPED in fsl-edma-common.h

Frank

> -		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
> 

Re: [PATCH v4 2/2] dt-bindings: fsl-dma: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string

[Frank Li]

On Wed, Apr 17, 2024 at 11:26:42AM +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.
> 
> Signed-off-by: Joy Zou <joy.zou@nxp.com>

"So remove it safely." 

There are no 'workaround' in bindings doc. after fix it,

Reviewed-by: Frank Li <Frank.Li@nxp.com>

> ---
> Changes for v4:
> 1. adjust the subject to keep consistent with existing patches.
> 
> 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
> 

Re: [PATCH v4 2/2] dt-bindings: fsl-dma: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string

[Rob Herring]

On Wed, 17 Apr 2024 11:26:42 +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.
> 
> Signed-off-by: Joy Zou <joy.zou@nxp.com>
> ---
> Changes for v4:
> 1. adjust the subject to keep consistent with existing patches.
> 
> 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(-)
> 

Reviewed-by: Rob Herring (Arm) <robh@kernel.org>

RE: [PATCH v4 1/2] dmaengine: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string

[Joy Zou]

> -----Original Message-----
> From: Frank Li <frank.li@nxp.com>
> Sent: 2024年4月17日 22:40
> To: Joy Zou <joy.zou@nxp.com>
> Cc: Peng Fan <peng.fan@nxp.com>; vkoul@kernel.org; robh@kernel.org;
> krzk+dt@kernel.org; conor+dt@kernel.org; imx@lists.linux.dev;
> dmaengine@vger.kernel.org; linux-kernel@vger.kernel.org;
> devicetree@vger.kernel.org
> Subject: Re: [PATCH v4 1/2] dmaengine: fsl-edma: clean up unused
> "fsl,imx8qm-adma" compatible string
> > 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) {
> 
> You forget remove FSL_EDMA_DRV_QUIRK_SWAPPED in fsl-edma-common.h
Thanks your comments!
Yeah, will remove it in next version.
BR
Joy Zou
> 
> Frank
> 

RE: [PATCH v4 2/2] dt-bindings: fsl-dma: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string

[Joy Zou]

> -----Original Message-----
> From: Frank Li <frank.li@nxp.com>
> Sent: 2024年4月17日 22:45
> To: Joy Zou <joy.zou@nxp.com>
> Cc: Peng Fan <peng.fan@nxp.com>; vkoul@kernel.org; robh@kernel.org;
> krzk+dt@kernel.org; conor+dt@kernel.org; imx@lists.linux.dev;
> dmaengine@vger.kernel.org; linux-kernel@vger.kernel.org;
> devicetree@vger.kernel.org
> Subject: Re: [PATCH v4 2/2] dt-bindings: fsl-dma: fsl-edma: clean up unused
> "fsl,imx8qm-adma" compatible string
> 
> On Wed, Apr 17, 2024 at 11:26:42AM +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.
> >
> > Signed-off-by: Joy Zou <joy.zou@nxp.com>
> 
> "So remove it safely."
> 
> There are no 'workaround' in bindings doc. after fix it,
Thanks for your comments!
Will change the commit message in next version.
BR
Joy Zou
> 
> Reviewed-by: Frank Li <Frank.Li@nxp.com>
> 
> > ---
> > Changes for v4:
> > 1. adjust the subject to keep consistent with existing patches.
> >
> > 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(-)
> >