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

[PATCH v2 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 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        |  1 -
 drivers/dma/fsl-edma-common.c                    | 16 ++++------------
 drivers/dma/fsl-edma-main.c                      |  8 --------
 3 files changed, 4 insertions(+), 21 deletions(-)

-- 
2.37.1

[PATCH v2 1/2] dmaengine: fsl-edma: Remove 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 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 v2 2/2] dma: dt-bindings: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string

[Joy Zou]

The compatible string "fsl,imx8qm-adma" is unused.

Signed-off-by: Joy Zou <joy.zou@nxp.com>
---
 Documentation/devicetree/bindings/dma/fsl,edma.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/dma/fsl,edma.yaml b/Documentation/devicetree/bindings/dma/fsl,edma.yaml
index 825f4715499e..64fa27d0cd9b 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
-- 
2.37.1

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

[Krzysztof Kozlowski]

On 11/04/2024 09:43, Joy Zou wrote:
> The compatible string "fsl,imx8qm-adma" is unused.

Why? Commit must stand on its own.

> 
> Signed-off-by: Joy Zou <joy.zou@nxp.com>
> ---

Please use subject prefixes matching the subsystem. You can get them for
example with `git log --oneline -- DIRECTORY_OR_FILE` on the directory
your patch is touching.

>  Documentation/devicetree/bindings/dma/fsl,edma.yaml | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/dma/fsl,edma.yaml b/Documentation/devicetree/bindings/dma/fsl,edma.yaml
> index 825f4715499e..64fa27d0cd9b 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


I see more usages. One more trivial patch which is incorrect.

Did you implement the internal review?

Best regards,
Krzysztof

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

[Frank Li]

It should be

dt-bindings: fsl-dma: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible stringg


b7b8715b430ee dt-bindings: fsl-dma: fsl-edma: add fsl,imx95-edma5 compatible string
6eb439dff645a dt-bindings: fsl-dma: fsl-edma: add edma3 compatible string
10cafa2d45885 dt-bindings: dma: drop unneeded quotes
cfa1927f8468c dt-bindings: dma: fsl-edma: Convert to DT schema


On Thu, Apr 11, 2024 at 10:13:38AM +0200, Krzysztof Kozlowski wrote:
> On 11/04/2024 09:43, Joy Zou wrote:
> > The compatible string "fsl,imx8qm-adma" is unused.
> 
> Why? Commit must stand on its own.

Joy:
	You can copy patch2's comit
> 
> > 
> > Signed-off-by: Joy Zou <joy.zou@nxp.com>
> > ---
> 
> Please use subject prefixes matching the subsystem. You can get them for
> example with `git log --oneline -- DIRECTORY_OR_FILE` on the directory
> your patch is touching.
> 
> >  Documentation/devicetree/bindings/dma/fsl,edma.yaml | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/dma/fsl,edma.yaml b/Documentation/devicetree/bindings/dma/fsl,edma.yaml
> > index 825f4715499e..64fa27d0cd9b 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
> 
> 
> I see more usages. One more trivial patch which is incorrect.
> 

Please clean up AllOf also.

allOf:                                                                     
  - $ref: dma-controller.yaml#                                             
  - if:                                                                    
      properties:                                                          
        compatible:                                                        
          contains:                                                        
            enum:                                                          
              - fsl,imx8qm-adma  
                           ^^^^                                          
              - fsl,imx8qm-edma  

> Did you implement the internal review?

Patch2 was internal reviewed. Patch1 is new. I know you are busy. Could
you please give me 1 days to review nxp's patches. You see patch always
ahead me if author and you are in similar time zone. 

I knew they are quite busy on heavy development work and all kinds
customer supports. 

Frank

> Best regards,
> Krzysztof
> 

Re: [PATCH v2 1/2] dmaengine: fsl-edma: Remove unused "fsl,imx8qm-adma" compatible string

[Frank Li]

On Thu, Apr 11, 2024 at 03:43:25PM +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 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) {

Please also remove FSL_EDMA_DRV_QUIRK_SWAPPED macro define 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 v2 2/2] dma: dt-bindings: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible stringg

[Joy Zou]

> -----Original Message-----
> From: Frank Li <frank.li@nxp.com>
> Sent: 2024年4月11日 21:21
> To: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Joy Zou <joy.zou@nxp.com>; 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 v2 2/2] dma: dt-bindings: fsl-edma: clean up unused
> "fsl,imx8qm-adma" compatible stringg
> 
> 
> It should be
> 
> dt-bindings: fsl-dma: fsl-edma: clean up unused "fsl,imx8qm-adma"
> compatible stringg
> 
> 
> b7b8715b430ee dt-bindings: fsl-dma: fsl-edma: add fsl,imx95-edma5
> compatible string 6eb439dff645a dt-bindings: fsl-dma: fsl-edma: add edma3
> compatible string
> 10cafa2d45885 dt-bindings: dma: drop unneeded quotes cfa1927f8468c
> dt-bindings: dma: fsl-edma: Convert to DT schema
> 
> 
> On Thu, Apr 11, 2024 at 10:13:38AM +0200, Krzysztof Kozlowski wrote:
> > On 11/04/2024 09:43, Joy Zou wrote:
> > > The compatible string "fsl,imx8qm-adma" is unused.
> >
> > Why? Commit must stand on its own.
> 
> Joy:
> 	You can copy patch2's comit
Thanks your comments!
Will add more description for the drop reason.
> >
> > >
> > > Signed-off-by: Joy Zou <joy.zou@nxp.com>
> > > ---
> >
> > Please use subject prefixes matching the subsystem. You can get them
> > for example with `git log --oneline -- DIRECTORY_OR_FILE` on the
> > directory your patch is touching.
> >
> > >  Documentation/devicetree/bindings/dma/fsl,edma.yaml | 1 -
> > >  1 file changed, 1 deletion(-)
> > >
> > > diff --git a/Documentation/devicetree/bindings/dma/fsl,edma.yaml
> > > b/Documentation/devicetree/bindings/dma/fsl,edma.yaml
> > > index 825f4715499e..64fa27d0cd9b 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
> >
> >
> > I see more usages. One more trivial patch which is incorrect.
> >
> 
> Please clean up AllOf also.
> 
> allOf:
>   - $ref: dma-controller.yaml#
>   - if:
>       properties:
>         compatible:
>           contains:
>             enum:
>               - fsl,imx8qm-adma
>                            ^^^^
>               - fsl,imx8qm-edma
> 
Yeah, will clean up also.
BR
Joy Zou
> > Did you implement the internal review?
> 
> Patch2 was internal reviewed. Patch1 is new. I know you are busy. Could you
> please give me 1 days to review nxp's patches. You see patch always ahead
> me if author and you are in similar time zone.
> 
> I knew they are quite busy on heavy development work and all kinds
> customer supports.
> 
> Frank
> 
> > Best regards,
> > Krzysztof
> >