Received-SPF: pass (google.com: domain of linux-kernel+bounces-156385-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Joy Zou <joy.zou@nxp.com>
To: frank.li@nxp.com,
	peng.fan@nxp.com,
	vkoul@kernel.org,
	robh@kernel.org,
	krzk+dt@kernel.org,
	conor+dt@kernel.org
Cc: imx@lists.linux.dev,
	dmaengine@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	devicetree@vger.kernel.org
Subject: [PATCH v5 1/2] dmaengine: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string
Date: Wed, 24 Apr 2024 14:45:07 +0800
Message-Id: <20240424064508.1886764-2-joy.zou@nxp.com>
In-Reply-To: <20240424064508.1886764-1-joy.zou@nxp.com>
References: <20240424064508.1886764-1-joy.zou@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?gpD3V0ZXz4o5RMLdO3biNMzebdWw/iIzyJHnt7AgZhvy3kLcesEdiOpsMx7d?=
 =?us-ascii?Q?PD59nB3WP7slWbxByMq1HyCi4DZVPERspuzwLgc1DH8C4uJuTNoxmTqlxEZF?=
 =?us-ascii?Q?zrf9zFQlGvTNGbJkFyf3JMVJUh93VVQji+s4jBzQkjcqsjMQSUBH+JrSB4TX?=
 =?us-ascii?Q?LTmqDnecQCZyVbQxko2scyatUUp+v/UZ7+9ko7Dyagod825Qf9RmaFiGYmXc?=
 =?us-ascii?Q?vPvBtFb/EQf3ijpNfMwFcPXsatE52kxiPxiSLD8tdGo3cZYF2kXI2C5KSyVc?=
 =?us-ascii?Q?W6nCxbl9DYlb4K3bsTQfE+DbceZoJrmXVwY2Pkh4re41IKKY1oHU9Ls5N058?=
 =?us-ascii?Q?EqYzSS/O+8iXDCnj4b4ge+wnKV1gMYuyz9UGhou0MReQk9LwuBT80ex9Hb5V?=
 =?us-ascii?Q?UuEtpOXgCrhoHYNlj1TorRROMUol5s7YYMzTlNOpVJbtBlDTAJkLbgr5k+F0?=
 =?us-ascii?Q?GslEF0KgB5viRBY7q9kdmPPySmkh+bbPNqUBeZZuFT9IhJnOrx0dK6IPfp2T?=
 =?us-ascii?Q?oQWdjGhFFr04ccTSuqumwYxMZMS7p0JcPOvAIaCa/07kjy8z9EJ0FS28opGg?=
 =?us-ascii?Q?pZAmUFC3brePN0Fv4DiqIaMU3wj0nHrE16VXs5ZOIQmzOYNo+SUkEaYay1rs?=
 =?us-ascii?Q?BPFGZmTv05qOCd6I1UN4l0TiOOmMElDsL/I+ncXHVHXEeE5D5ZUFxRAPLqUJ?=
 =?us-ascii?Q?jEQqm8rbjZvX/YnSZivLJVPOc8H0+gThDPWzydXeFTUmpSQhR5yVKIKdy8LW?=
 =?us-ascii?Q?pp22w3M9AkahfjxhGK6jJjsd5lUa+NxOEGyT/cuxLPm2PToyiDQcVCF7Fxzk?=
 =?us-ascii?Q?Xsm1KH52KPZIICgDA9TXF5DbdSPsgYL8q9tosh15xOzH08mkeBUSBpcBOvYU?=
 =?us-ascii?Q?sJJ37GhGluiq53I3AMQtVLp1GjYBe09+zVlUACUnjenvY8Un95lgGYVb0N60?=
 =?us-ascii?Q?XlLz33GI3Nc8QZ6rK6kMTf351K0743pbHlvU3YAzO/Er0VvdyTW7KhxM2Lrp?=
 =?us-ascii?Q?Fjq0f4/x8ZLAmEyk8hwZUIWQnOXJDTPFFQFGInpCpzvonV36v5+78cc6GFQH?=
 =?us-ascii?Q?30ONRaZzmWg6CtboaRKb4Zu8al6oF9Vj4aC+vkUAvvjfj8Vnvcr9hlPU2td7?=
 =?us-ascii?Q?Zgyc9ppwx2+9DoYrBWzmJS2Qt9wOi3o0BU2raBkSC+hCOYMc7kaQ4o6gs2Rl?=
 =?us-ascii?Q?77XkYegyTcq39bH04Fq+23Zk7RzFls1pfvkTE9+Id9jER17NG1hBc2L9WlOu?=
 =?us-ascii?Q?/jfJlV2qg07zsmklYkbJK59+s5RqRlHSsIwBm524Ki21+uK6EA2HBO8c2vQF?=
 =?us-ascii?Q?9oyUZUyMy/1RUHTWXza0LJCcBTpO2Elw1xaFOznNUNaGojYj0nbhBkiTxx0l?=
 =?us-ascii?Q?9N5Q4J7Ssvepjjv/RhT9GX/T1QF5RYXdBqSjS10vf9o+Efyps3+FRa/ty3hb?=
 =?us-ascii?Q?QOxlpKansv+aurpAje1gxqWR6BDQiamzCcc/W7Bz+6p1Q2qa4n4E8uyi93Fo?=
 =?us-ascii?Q?4+oxq96OHnhHxmYmIRHdg4gEGl/ZhJlQc/LlzEL5+8D7zuvuW956m041xpfa?=
 =?us-ascii?Q?nDE8YXUn9SMsDJYDIPBy7+O+yoTJVmmn1PxR/Jh7?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 16d32ec9-ddc8-4434-d413-08dc6428ffa9
X-MS-Exchange-CrossTenant-AuthSource: AS4PR04MB9386.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2024 06:37:23.2661
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: atTKMM8hFehLHPezERlqHEolNxyqmeRZS3wS1GH0fftael0cj6Dv0Z5uB49u031Z
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9483

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