* [PATCH v5 0/2] clean up unused "fsl,imx8qm-adma" compatible string
@ 2024-04-24 6:45 Joy Zou
2024-04-24 6:45 ` [PATCH v5 1/2] dmaengine: fsl-edma: " Joy Zou
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Joy Zou @ 2024-04-24 6:45 UTC (permalink / raw)
To: frank.li, peng.fan, vkoul, robh, krzk+dt, conor+dt
Cc: imx, dmaengine, linux-kernel, devicetree
The patchset clean up "fsl,imx8qm-adma" compatible string.
For the details, please check the patch commit log.
---
Changes for v5:
1. remove remove FSL_EDMA_DRV_QUIRK_SWAPPED in fsl-edma-common.h.
2. modify the bindings patch commit message and add review tag.
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-common.h | 2 --
drivers/dma/fsl-edma-main.c | 8 --------
4 files changed, 4 insertions(+), 24 deletions(-)
--
2.37.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v5 1/2] dmaengine: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string
2024-04-24 6:45 [PATCH v5 0/2] clean up unused "fsl,imx8qm-adma" compatible string Joy Zou
@ 2024-04-24 6:45 ` Joy Zou
2024-04-24 13:09 ` Frank Li
2024-04-24 6:45 ` [PATCH v5 2/2] dt-bindings: fsl-dma: " Joy Zou
2024-04-25 9:17 ` [PATCH v5 0/2] " Vinod Koul
2 siblings, 1 reply; 5+ messages in thread
From: Joy Zou @ 2024-04-24 6:45 UTC (permalink / raw)
To: frank.li, peng.fan, vkoul, robh, krzk+dt, conor+dt
Cc: imx, dmaengine, linux-kernel, devicetree
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 v5:
1.remove FSL_EDMA_DRV_QUIRK_SWAPPED in fsl-edma-common.h
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-common.h | 2 --
drivers/dma/fsl-edma-main.c | 8 --------
3 files changed, 4 insertions(+), 22 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-common.h b/drivers/dma/fsl-edma-common.h
index 01157912bfd5..3f93ebb890b3 100644
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -194,8 +194,6 @@ struct fsl_edma_desc {
#define FSL_EDMA_DRV_HAS_PD BIT(5)
#define FSL_EDMA_DRV_HAS_CHCLK BIT(6)
#define FSL_EDMA_DRV_HAS_CHMUX BIT(7)
-/* imx8 QM audio edma remote local swapped */
-#define FSL_EDMA_DRV_QUIRK_SWAPPED BIT(8)
/* control and status register is in tcd address space, edma3 reg layout */
#define FSL_EDMA_DRV_SPLIT_REG BIT(9)
#define FSL_EDMA_DRV_BUS_8BYTE BIT(10)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v5 2/2] dt-bindings: fsl-dma: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string
2024-04-24 6:45 [PATCH v5 0/2] clean up unused "fsl,imx8qm-adma" compatible string Joy Zou
2024-04-24 6:45 ` [PATCH v5 1/2] dmaengine: fsl-edma: " Joy Zou
@ 2024-04-24 6:45 ` Joy Zou
2024-04-25 9:17 ` [PATCH v5 0/2] " Vinod Koul
2 siblings, 0 replies; 5+ messages in thread
From: Joy Zou @ 2024-04-24 6:45 UTC (permalink / raw)
To: frank.li, peng.fan, vkoul, robh, krzk+dt, conor+dt
Cc: imx, dmaengine, linux-kernel, devicetree
The eDMA hardware issue only exist imx8QM A0. A0 never mass production.
The compatible string "fsl,imx8qm-adma" is unused. So remove it safely.
Signed-off-by: Joy Zou <joy.zou@nxp.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Rob Herring (Arm) <robh@kernel.org>
---
Changes for v5:
1. modify the commit message.
2. add review tag.
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v5 1/2] dmaengine: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string
2024-04-24 6:45 ` [PATCH v5 1/2] dmaengine: fsl-edma: " Joy Zou
@ 2024-04-24 13:09 ` Frank Li
0 siblings, 0 replies; 5+ messages in thread
From: Frank Li @ 2024-04-24 13:09 UTC (permalink / raw)
To: Joy Zou
Cc: peng.fan, vkoul, robh, krzk+dt, conor+dt, imx, dmaengine,
linux-kernel, devicetree
On Wed, Apr 24, 2024 at 02:45:07PM +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>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
> ---
> Changes for v5:
> 1.remove FSL_EDMA_DRV_QUIRK_SWAPPED in fsl-edma-common.h
>
> 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-common.h | 2 --
> drivers/dma/fsl-edma-main.c | 8 --------
> 3 files changed, 4 insertions(+), 22 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-common.h b/drivers/dma/fsl-edma-common.h
> index 01157912bfd5..3f93ebb890b3 100644
> --- a/drivers/dma/fsl-edma-common.h
> +++ b/drivers/dma/fsl-edma-common.h
> @@ -194,8 +194,6 @@ struct fsl_edma_desc {
> #define FSL_EDMA_DRV_HAS_PD BIT(5)
> #define FSL_EDMA_DRV_HAS_CHCLK BIT(6)
> #define FSL_EDMA_DRV_HAS_CHMUX BIT(7)
> -/* imx8 QM audio edma remote local swapped */
> -#define FSL_EDMA_DRV_QUIRK_SWAPPED BIT(8)
> /* control and status register is in tcd address space, edma3 reg layout */
> #define FSL_EDMA_DRV_SPLIT_REG BIT(9)
> #define FSL_EDMA_DRV_BUS_8BYTE BIT(10)
> 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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v5 0/2] clean up unused "fsl,imx8qm-adma" compatible string
2024-04-24 6:45 [PATCH v5 0/2] clean up unused "fsl,imx8qm-adma" compatible string Joy Zou
2024-04-24 6:45 ` [PATCH v5 1/2] dmaengine: fsl-edma: " Joy Zou
2024-04-24 6:45 ` [PATCH v5 2/2] dt-bindings: fsl-dma: " Joy Zou
@ 2024-04-25 9:17 ` Vinod Koul
2 siblings, 0 replies; 5+ messages in thread
From: Vinod Koul @ 2024-04-25 9:17 UTC (permalink / raw)
To: frank.li, peng.fan, robh, krzk+dt, conor+dt, Joy Zou
Cc: imx, dmaengine, linux-kernel, devicetree
On Wed, 24 Apr 2024 14:45:06 +0800, Joy Zou wrote:
> The patchset clean up "fsl,imx8qm-adma" compatible string.
> For the details, please check the patch commit log.
>
Applied, thanks!
[1/2] dmaengine: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string
commit: 77584368a0f3d9eba112c3df69f1df7f282dbfe9
[2/2] dt-bindings: fsl-dma: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string
commit: 44177a586fe463150def993de0371f1a82d3465c
Best regards,
--
~Vinod
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-25 9:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-24 6:45 [PATCH v5 0/2] clean up unused "fsl,imx8qm-adma" compatible string Joy Zou
2024-04-24 6:45 ` [PATCH v5 1/2] dmaengine: fsl-edma: " Joy Zou
2024-04-24 13:09 ` Frank Li
2024-04-24 6:45 ` [PATCH v5 2/2] dt-bindings: fsl-dma: " Joy Zou
2024-04-25 9:17 ` [PATCH v5 0/2] " Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).