From patchwork Wed Apr 24 06:45:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joy Zou X-Patchwork-Id: 13641387 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2043.outbound.protection.outlook.com [40.107.21.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D312B157E91 for ; Wed, 24 Apr 2024 06:37:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713940647; cv=fail; b=h0mx806LN1OtjWpocHuCzelzrSv5w4oYsZ5z/NdrB/0YrWMugb7mhnD0R3JkrX76kWw6hGzEmSoBYXeBsgqgDZ6C6U1AgkAOqkFUOO/Z8xJcfoHPqwi1rdpoPaK7IbCOL/I/b1Pgn1bDlqMTCPqo+OUv3wfj+xYujPc8L10k4DM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713940647; c=relaxed/simple; bh=W3LTSyuLt21SC79pPBil468zl9dzxwwl1NyATR/v8qU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=SXKBu/FKLgzWZGfJY7Dtc7c8RMfOlWgysY4w4Hzbuj+SBPrC/SlwnFiGVGs4bLttkp5Njf7ZxCl1WL1qBiXPJLxJJxjBD0JIQoVYkfViucqTqXLWZ4uiZ0uRrwmAMg+1AETqyGj/Vp9FX7I/KSfRqUwFkaMss1c8cGBB8I0GqJA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b=A/lrX3qn; arc=fail smtp.client-ip=40.107.21.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="A/lrX3qn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gkzcXxcShCjsoZggGu5YHQ0RBPcnUnX7NC8z/hhluFZp+UPR7U1Kc9XC4r0kjWmza4dXna2VyBxZR65+wGqIqdDVGQw1jc3TIY1RMXGgtOMQ5Vl7jRAjw4icr8kaLGK0Db6fKcg9JSTU3jOaKoHaZe874hnnglxht740iKDnr4HcBYU9F4vD2sUGGktE718D22JrvJKYVInu4BX9mouWPav+Lr73evplWKSri8ArWLMIpL1+cKJd8LjdoVA2M8hbOyPi2SX3qsePjVVXjgMj0dzIhVbrGrzgHy3CzFr+8kzWnHLycoxHZX9wuTTKwoX2A9ZIwgWM9cA6Cmx61CQCUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qCCyHD+u9gv4KaZuIG4LHHPnIcWkqUrq1ch/K6W7oFI=; b=ishqLX2VcsKAcFE9mdiTHeLMoXha24dq9Bi1/h5F0cyW8xuFjN6dMpvkEIoEbQ5hbaaiJrMuPu5ofsX9iafKfshc808sCNDqek1jUQsP04gHmfzEIs1Zz6FLqVFQSzC0TOlvi2UzoIF2K7YwuKbZvXsX/oCguwlEd73XW/dWwUZzqGu6xZadXLl1uXMEL2+9LW8X9fuGsa3STPOhPgjWBjYlSUhcHLE1LAvUPVeGKymAqxQ4ERyObVLna5wPOozg+Lza7Z3TD8MaamAeKKNbCFaf+lT7EFb9acQoVRCC/CXn4/S9kLuB15wnRcRSQdJmykAztihemVd3QPIUBAFoIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qCCyHD+u9gv4KaZuIG4LHHPnIcWkqUrq1ch/K6W7oFI=; b=A/lrX3qnFE9WiED65pgfgeW36Xk8Z0IugWNUxYdmadxzVsh+vSTbOLEcPv1XYo65dg67pMmYDTrrwfacmGGCHgEb6xFM644W5ScOIbiIPSmtkGeQSHnsfz/cUH3AmbvfdNYxbqpkGD3StWbM2a0VE10KkOnjgTbdj4vL0jD/N+E= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS4PR04MB9386.eurprd04.prod.outlook.com (2603:10a6:20b:4e9::8) by AS4PR04MB9483.eurprd04.prod.outlook.com (2603:10a6:20b:4ec::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.44; Wed, 24 Apr 2024 06:37:23 +0000 Received: from AS4PR04MB9386.eurprd04.prod.outlook.com ([fe80::4f24:3f44:d5b1:70ba]) by AS4PR04MB9386.eurprd04.prod.outlook.com ([fe80::4f24:3f44:d5b1:70ba%7]) with mapi id 15.20.7472.044; Wed, 24 Apr 2024 06:37:23 +0000 From: Joy Zou 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> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20240424064508.1886764-1-joy.zou@nxp.com> References: <20240424064508.1886764-1-joy.zou@nxp.com> X-ClientProxiedBy: SG2P153CA0029.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::16) To AS4PR04MB9386.eurprd04.prod.outlook.com (2603:10a6:20b:4e9::8) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR04MB9386:EE_|AS4PR04MB9483:EE_ X-MS-Office365-Filtering-Correlation-Id: 16d32ec9-ddc8-4434-d413-08dc6428ffa9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pqsC/wWEzZ7TOfaHq1Pq1Sz+YCvd+/6SFMkI+rIXlQFsiQ7MqlYe1+yw3cbDd4plfvTZWUlPlKv3eSivXWmIVZMC1fFfZpY/muDvSdKeH2vpykjySCLVsRYR+esXQuftYklZ5i9wU8vBMwKYAbLd2ssEIb7OL5c7LzLLMsGeC1sO2NlglFwkIW3darHXJOEQ6tg4a+I2bXyqtOhF5dC7tj/p38z1JVgDA0Ja5fNtqqnNXh/SmBlI6m9BoxJKw8hDsRlUAHqQxW/qwnQ+e7oBYQj4sBauTQ7ef7dpVRt6WFv5l6LIJeLOve8AhisY0YgyLHjETI2D7RUbiZSK+f3gge433WrlLhwjxyIHT2kGg41j2kzlikvXnKX0NN1C5nU1eKn/G4UMuf2tW6XbvWxtIA7Wry4yt89N+9DIWGGOER2CYiHZCm9HdX7qCYUL3cUJzpgA/f4A7o3yMT0KaTU0LASkqwSQ5KvMjSl+ofndUbQFgDAk/g7nNXC+lYP9MsihTRUAktxzJJXzRybMb4DSrnl5SR0NcSFwIBN0NRLVEsB/pB8Ci2hL7TYd1YmmTI0zlpQD42D7ugt1VYfVGW0co7/ilBzEKrDbMAwfd2+KbmsN8NN09sVu2c0Zb0iVj87028Xkx0oz3qo8fx26/KiXQXFUs5pqHzJ1l1IfAdEBjS3NWRzvWjOLWEaOaBzp6xnpBZjLWjmWiN0iziAO4s7U/x1+PwkvmoUagm+jXdrIO7vk30kGDnrh2ylAVcEeFsgtKLO+MjtbzSeQ24Xty5EVXoMPBRHA9YIBgKcsVLKMP8/HMh8ezker4bAerr3k9rVRUMQsLE2mwo1HiSeGy+TC9N15OkzUm2d/p5gB/RnMndH2xRZkalK1iKFffJHgyhWWRpGBH4JAm4OFuNF5/9/FfYTm0AogFXJ4hhuwL+aZRzH3F8cte6NyuojuFrsXgUgIazV0Py87LfAAOP3iCUOjr/4lHNV+DEQicyuHJIEEPWfTSjtl6gcKZeL+kqYZRfuK5Q99Tegs54+A8MLn+4BDIWCGK93R/6MH2jNxy/uzf14yXXp46yEy/3qiY70rOs7oWLjfUjKzcIvBx3oFBvuBkSAPSEBB62B1eEjgseuYX+3lp35iOf2vS6L8gCijFre/X03mvHPg7v9CvlpYaadG0y9CDBzvaBgcjpSpRAk6ix84+7lVfN3dkvzejzB3XhHFW0/IYKRBDNjfZDn6veaVw5kjYdfGRapLAJasMK1I1DhNY1lwuPnYSa7EH5bDfy5LhUBudySXQp2MHPzVb+5oKuSwBQrAjSo9bxyJLgDnXH4O7nmNOO4yZcvz1+ofDw19t2xHq1DmvXE8nP4AE+TeLQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR04MB9386.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(52116005)(376005)(366007)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gpD3V0ZXz4o5RMLdO3biNMzebdWw/iIzyJHnt7AgZhvy3kLcesEdiOpsMx7dPD59nB3WP7slWbxByMq1HyCi4DZVPERspuzwLgc1DH8C4uJuTNoxmTqlxEZFzrf9zFQlGvTNGbJkFyf3JMVJUh93VVQji+s4jBzQkjcqsjMQSUBH+JrSB4TXLTmqDnecQCZyVbQxko2scyatUUp+v/UZ7+9ko7Dyagod825Qf9RmaFiGYmXcvPvBtFb/EQf3ijpNfMwFcPXsatE52kxiPxiSLD8tdGo3cZYF2kXI2C5KSyVcW6nCxbl9DYlb4K3bsTQfE+DbceZoJrmXVwY2Pkh4re41IKKY1oHU9Ls5N058EqYzSS/O+8iXDCnj4b4ge+wnKV1gMYuyz9UGhou0MReQk9LwuBT80ex9Hb5VUuEtpOXgCrhoHYNlj1TorRROMUol5s7YYMzTlNOpVJbtBlDTAJkLbgr5k+F0GslEF0KgB5viRBY7q9kdmPPySmkh+bbPNqUBeZZuFT9IhJnOrx0dK6IPfp2ToQWdjGhFFr04ccTSuqumwYxMZMS7p0JcPOvAIaCa/07kjy8z9EJ0FS28opGgpZAmUFC3brePN0Fv4DiqIaMU3wj0nHrE16VXs5ZOIQmzOYNo+SUkEaYay1rsBPFGZmTv05qOCd6I1UN4l0TiOOmMElDsL/I+ncXHVHXEeE5D5ZUFxRAPLqUJjEQqm8rbjZvX/YnSZivLJVPOc8H0+gThDPWzydXeFTUmpSQhR5yVKIKdy8LWpp22w3M9AkahfjxhGK6jJjsd5lUa+NxOEGyT/cuxLPm2PToyiDQcVCF7FxzkXsm1KH52KPZIICgDA9TXF5DbdSPsgYL8q9tosh15xOzH08mkeBUSBpcBOvYUsJJ37GhGluiq53I3AMQtVLp1GjYBe09+zVlUACUnjenvY8Un95lgGYVb0N60XlLz33GI3Nc8QZ6rK6kMTf351K0743pbHlvU3YAzO/Er0VvdyTW7KhxM2LrpFjq0f4/x8ZLAmEyk8hwZUIWQnOXJDTPFFQFGInpCpzvonV36v5+78cc6GFQH30ONRaZzmWg6CtboaRKb4Zu8al6oF9Vj4aC+vkUAvvjfj8Vnvcr9hlPU2td7Zgyc9ppwx2+9DoYrBWzmJS2Qt9wOi3o0BU2raBkSC+hCOYMc7kaQ4o6gs2Rl77XkYegyTcq39bH04Fq+23Zk7RzFls1pfvkTE9+Id9jER17NG1hBc2L9WlOu/jfJlV2qg07zsmklYkbJK59+s5RqRlHSsIwBm524Ki21+uK6EA2HBO8c2vQF9oyUZUyMy/1RUHTWXza0LJCcBTpO2Elw1xaFOznNUNaGojYj0nbhBkiTxx0l9N5Q4J7Ssvepjjv/RhT9GX/T1QF5RYXdBqSjS10vf9o+Efyps3+FRa/ty3hbQOxlpKansv+aurpAje1gxqWR6BDQiamzCcc/W7Bz+6p1Q2qa4n4E8uyi93Fo4+oxq96OHnhHxmYmIRHdg4gEGl/ZhJlQc/LlzEL5+8D7zuvuW956m041xpfanDE8YXUn9SMsDJYDIPBy7+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 Reviewed-by: Frank Li --- 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},