From patchwork Mon Nov 27 22:55:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 747652 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="mrAo9VuM" Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on062b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1e::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 874DC1A2; Mon, 27 Nov 2023 14:56:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k7r/2OlBB+32XX0MImtjzmN88Ons1SKTxi4WF/0rNaDnnDimnCaqDlB76v0CnRaFoCbuR6uOkLIPNABhH0LlrB4PXzBdCyNUCBBa3lDgCxn/PVDIA5fsFuqgcuLH4UwRh8YC6pudPewqy+QMpr9bZsUUQHOR/KirUlwKQTJiDPdz+7obLoPPH9pogH4u/1Zr9jglVQCYGSDoLdL4BoYl1FFqJw5q7DDHFQW7jxI1JwKcd+OZxvTd/THUDGOxvy/CxicrFn0ucSBqllwGrzNyqVUQBOgejAkOIfnB64ktovg9xKmha7/p0GseJDrf6yd/h047Zx0IXLNB/sLDyAF1BA== 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=K7yVzVo7EuQGlTzc4m2DQUz+qtkprIyQR4WJck0cUOk=; b=AuW0Gq1O4vl2musha12t28GTz/LdcH+PhcZ8StnBenuryLUYL4BwVwFKPDVRKDpmUHV7pmXB7eMVMEK7jcp4Lj8AXKMmHIrogNAcBHcPKanTc4rEuPg5iOgExTaHol841fzr2u8lY0bCxE3JtNWOrelCVguPZc/Ve4MbTmVZHICBJs1CP6PEMZA4NCtxGu7VXI4P3RWKLZAepToo1ecZwpbfNuPpUbVz5IgG0u7nU+nCmtfTbmJjk4YZglPGcIOVyqM81ovEoF372kGoeOvF09xWdxYqFw1+v+qzuaacgAqLnYFZb9fMlU4BU58owsG2Zt/jbvqzVzagP9/tYXnAaw== 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=K7yVzVo7EuQGlTzc4m2DQUz+qtkprIyQR4WJck0cUOk=; b=mrAo9VuMFQDro4CejxiDBa5vXWQyWg+GwWvu5SxilT/79RVMSOKPbGPi9iknNHMnhJck3Ss1j9h0JctHrHk2eHFTAp7yyMZGPOvNwpn6Ea8ryE4zc3dIDYgjQ0qSV8jZo33G2cFUpehF3Ui5F6ZAcMx36eMyFwrOylesRY0Ce40= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by AM8PR04MB7858.eurprd04.prod.outlook.com (2603:10a6:20b:237::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.21; Mon, 27 Nov 2023 22:56:03 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::95f5:5118:258f:ee40]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::95f5:5118:258f:ee40%6]) with mapi id 15.20.7046.015; Mon, 27 Nov 2023 22:56:03 +0000 From: Frank Li To: frank.li@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, krzysztof.kozlowski+dt@linaro.org, linux-kernel@vger.kernel.org, peng.fan@nxp.com, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v3 1/6] dmaengine: fsl-edma: involve help macro fsl_edma_set(get)_tcd() Date: Mon, 27 Nov 2023 17:55:37 -0500 Message-Id: <20231127225542.2744711-2-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231127225542.2744711-1-Frank.Li@nxp.com> References: <20231127225542.2744711-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR05CA0116.namprd05.prod.outlook.com (2603:10b6:a03:334::31) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|AM8PR04MB7858:EE_ X-MS-Office365-Filtering-Correlation-Id: 650225f6-e457-4d02-83ec-08dbef9c082a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u8JAoU1Ivd0R6A3oDwlkzwXUqF9CVKCrJrvTaKZsmWxPq1xjadslhqwbjCHMru2XdDuwnn/VAHLK8dgZqKcL12+lYHiykmZXjA7WUY2iAJd2OaTTG9gktX9HLF7q4rRDsBVwYX6VXCG88qPNjn55x2Dn/gACBz8/htePl2XtcxDdYz6Bco+BS0MCH2O4yY2slYH+KZutFdq0ZrH0vmyVeyJTNaxoywpDK1VE2/+3O20M6GtZHQi9U9ekSOE0BM29H9JM92OSSZd9QVkKoJQVBYG0RMFzY+Ssgm6s/TrVHwDS3pQYGeoaRQcNZ1Q+l9HjZftkplYvykcI3gAJ1LxDjNZWT9ucQIHaaTeG2MOQ+FiTGxS/fFH2adwbSM7BopwJewgGJ1DaUurixCPJkjsk8eQzVfgUpYwA7jlXNDDEtD1lto/YVEB2DbdQF9ZAe4ViBeyL5B6BpZyZux+dm9cM+z77TGalcTYIaCUOYa8bbd8ukozTH/nvTYd3x76erLjGw4pXxd6Ldf26/yGysPbzPS5cJXrFueNhFwsNOeqk7jMtX5gCJUGJvCFGGdMDr6K6lFN6e7mhBv+DDbbJahxV9u8UvDhtnM1kQ3PsNrvEGhGUYhdocHdhCcjoZJkTKc+e X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB4838.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(396003)(136003)(346002)(366004)(376002)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(2616005)(26005)(1076003)(6666004)(6506007)(8676002)(52116002)(4326008)(8936002)(6486002)(86362001)(5660300002)(478600001)(316002)(66946007)(66476007)(66556008)(38100700002)(83380400001)(6512007)(38350700005)(2906002)(41300700001)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YuNdakhGWvwnrObqp7S6bMrPS9y/BqY1ykSgPurD726ndwI5tfTJm5eK4k1YFF/b80vRjQ/QAk1eIQoWJbiXiBl1Jv2TmjMVPiO9PERzO8XCzIkYm8k3KIr8OWeQYzSCqoFYJv4vxPBQ2iISwwyYmFlq+IoZiV8bkpNKj5CIEVdivTl7Pun24+U6OeBXlJEozjxLq8vlFVppj2EicHC6zVg40I2VkulgAntWFqovzR3oxgyQk2ljXDjnRSTKNZWGTN+4VsBEjw4vy5rzP0ZtD2QtYidvaQoQpi1Hioe6rdC+JCkiF+Honwh7fwkp5OoeJc5oxXjx21NnUUKx8aJAQLRKj2HIErWv6sOO4GR3aNw/lyG8dO/VHsaCUhXBDA2xRG1NexuojIzXAiZKfYKLH2pRiEwfyHpqHiL+bZFtFOGv2jzSv1L/a0GWWSCcQbw4IgLEOCqcafEcTjab7nYl1TtoVPodLw2FukDOLSY/uI5ZkOccd8is3cQ3eyPDRHRI2NjiZ+GVgGvwNGnX3dpP944C893rJXXrwMGObxZXybiCKbkWSehlW+Mzxqhav6KLKZ4mVDSsNHT5ojdN9RIOKj/Qzx7xM57FbQgbJHXRJHREwnJtuU5wvH4eeRQMEQ1VWItbGqYr6tSuA7rnBtO07aglE01AYIoOdGn6ERD51tkgevVr8dmfMWWa1MCuyyT3ZFFGw09Vu3F0yiZ+xMKLaWaCx1aCfDTjkSm6/v76mqtE2nRtXNns6ZtvgRSU7PguKdlUE4EI+iSwlu8i0AFBo7aRQwvkL2pTWNHZokFiSD5tU3IiUnZKSKMOhWX/55N/NpRYfvBTlZVQRh8A9A0pKhNQBnf3Ea+JH9FjJW3L70GzOLrHx14/Q5JKbQCT/wdF+rjkUzWhLkwhJXohCdjt0KLzBrWPsH/YoOHPKeE3b603DdNeIcHdzi+ddZrT/gh6xQdUk6YPi6/UcbU1jenWjTDp1gs2VQv7f/w6yghIF+lvrT5I1WBUQ+Dz3TjoHN4Xa/gNicV0lZ5dpINGt8xVZtoTuaV2ys0yCIIU/fk3Xq+p6c8Nb3gDfR2qvor1DlSUX3hxKOS8yzf3+tyV2cF+DC+R9Hxlun2rOIK7AwBQVRVT5Z1Zzb4TtIw/HhNoz+2cCVTynJFLFIp6aMUEaMPJm7F/kJK6zq/yT9K8PpVVgpz6UCIydaF15V7Zl007GviZmW4e7hnyQeje+xvpkEr8amFl9hesaw8HOhzaIC1DoLnk3qPkXubZS/hnEajcibxkgO+A+x3WIpAbEu+D3OYrRIPVtAiw3eIefHMMHYBzp65Tc3Lp7h83X60uqP/MuS8Ar7LHZ7K20+1mhPhBrCojdn0zV38W3WE/pJ+jyiftApCwsVLQvKuGkYj8Zs+G3vNLm6tyqaeft9KT8peTlturghaJCxRlClmRnGkHkrKCWNr7rYnocpG3IAduaRCahClKNNUM7EY1v6QgiMVjGG1031HCAS0P16zi6lQ1yGwckzfJ41VsyFAhLRl6XXFFJypW3bizz/vMeMKCKnnjI0KEmbHSwL5tBcgdqrGt6s84aAM= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 650225f6-e457-4d02-83ec-08dbef9c082a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2023 22:56:03.8815 (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: 9YKiudgSd23f4n/LiXTCoDYiAdtPIF4tO8/y7csfTZnnvxizwTR0gUVH6HBF0vYE1PRMAO8pCemKTCg/fqXw+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7858 Using help macro fsl_edma_set(get)_tcd() and edma_cp_tcd_to_reg() to handle difference field size. This is not function change and prepare for 64bit tcd in imx95. Signed-off-by: Frank Li --- drivers/dma/fsl-edma-common.c | 61 ++++++++++++++++++----------------- drivers/dma/fsl-edma-common.h | 23 +++++++++++++ 2 files changed, 54 insertions(+), 30 deletions(-) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index b53f46245c377..50f55d7566a33 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -358,10 +358,10 @@ static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan, /* calculate the total size in this desc */ for (len = i = 0; i < fsl_chan->edesc->n_tcds; i++) { - nbytes = le32_to_cpu(edesc->tcd[i].vtcd->nbytes); + nbytes = fsl_edma_get_tcd_to_cpu(fsl_chan, edesc->tcd[i].vtcd, nbytes); if (nbytes & (EDMA_V3_TCD_NBYTES_DMLOE | EDMA_V3_TCD_NBYTES_SMLOE)) nbytes = EDMA_V3_TCD_NBYTES_MLOFF_NBYTES(nbytes); - len += nbytes * le16_to_cpu(edesc->tcd[i].vtcd->biter); + len += nbytes * fsl_edma_get_tcd_to_cpu(fsl_chan, edesc->tcd[i].vtcd, biter); } if (!in_progress) @@ -374,16 +374,16 @@ static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan, /* figure out the finished and calculate the residue */ for (i = 0; i < fsl_chan->edesc->n_tcds; i++) { - nbytes = le32_to_cpu(edesc->tcd[i].vtcd->nbytes); + nbytes = fsl_edma_get_tcd_to_cpu(fsl_chan, edesc->tcd[i].vtcd, nbytes); if (nbytes & (EDMA_V3_TCD_NBYTES_DMLOE | EDMA_V3_TCD_NBYTES_SMLOE)) nbytes = EDMA_V3_TCD_NBYTES_MLOFF_NBYTES(nbytes); - size = nbytes * le16_to_cpu(edesc->tcd[i].vtcd->biter); + size = nbytes * fsl_edma_get_tcd_to_cpu(fsl_chan, edesc->tcd[i].vtcd, biter); if (dir == DMA_MEM_TO_DEV) - dma_addr = le32_to_cpu(edesc->tcd[i].vtcd->saddr); + dma_addr = fsl_edma_get_tcd_to_cpu(fsl_chan, edesc->tcd[i].vtcd, saddr); else - dma_addr = le32_to_cpu(edesc->tcd[i].vtcd->daddr); + dma_addr = fsl_edma_get_tcd_to_cpu(fsl_chan, edesc->tcd[i].vtcd, daddr); len -= size; if (cur_addr >= dma_addr && cur_addr < dma_addr + size) { @@ -439,26 +439,26 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, */ edma_write_tcdreg(fsl_chan, 0, csr); - edma_write_tcdreg(fsl_chan, tcd->saddr, saddr); - edma_write_tcdreg(fsl_chan, tcd->daddr, daddr); + edma_cp_tcd_to_reg(fsl_chan, tcd, saddr); + edma_cp_tcd_to_reg(fsl_chan, tcd, daddr); - edma_write_tcdreg(fsl_chan, tcd->attr, attr); - edma_write_tcdreg(fsl_chan, tcd->soff, soff); + edma_cp_tcd_to_reg(fsl_chan, tcd, attr); + edma_cp_tcd_to_reg(fsl_chan, tcd, soff); - edma_write_tcdreg(fsl_chan, tcd->nbytes, nbytes); - edma_write_tcdreg(fsl_chan, tcd->slast, slast); + edma_cp_tcd_to_reg(fsl_chan, tcd, nbytes); + edma_cp_tcd_to_reg(fsl_chan, tcd, slast); - edma_write_tcdreg(fsl_chan, tcd->citer, citer); - edma_write_tcdreg(fsl_chan, tcd->biter, biter); - edma_write_tcdreg(fsl_chan, tcd->doff, doff); + edma_cp_tcd_to_reg(fsl_chan, tcd, citer); + edma_cp_tcd_to_reg(fsl_chan, tcd, biter); + edma_cp_tcd_to_reg(fsl_chan, tcd, doff); - edma_write_tcdreg(fsl_chan, tcd->dlast_sga, dlast_sga); + edma_cp_tcd_to_reg(fsl_chan, tcd, dlast_sga); - csr = le16_to_cpu(tcd->csr); + csr = fsl_edma_get_tcd_to_cpu(fsl_chan, tcd, csr); if (fsl_chan->is_sw) { csr |= EDMA_TCD_CSR_START; - tcd->csr = cpu_to_le16(csr); + fsl_edma_set_tcd_to_le(fsl_chan, tcd, csr, csr); } /* @@ -473,7 +473,7 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, edma_writel_chreg(fsl_chan, edma_readl_chreg(fsl_chan, ch_csr), ch_csr); - edma_write_tcdreg(fsl_chan, tcd->csr, csr); + edma_cp_tcd_to_reg(fsl_chan, tcd, csr); } static inline @@ -493,12 +493,12 @@ void fsl_edma_fill_tcd(struct fsl_edma_chan *fsl_chan, * So we put the value in little endian in memory, waiting * for fsl_edma_set_tcd_regs doing the swap. */ - tcd->saddr = cpu_to_le32(src); - tcd->daddr = cpu_to_le32(dst); + fsl_edma_set_tcd_to_le(fsl_chan, tcd, src, saddr); + fsl_edma_set_tcd_to_le(fsl_chan, tcd, dst, daddr); - tcd->attr = cpu_to_le16(attr); + fsl_edma_set_tcd_to_le(fsl_chan, tcd, attr, attr); - tcd->soff = cpu_to_le16(soff); + fsl_edma_set_tcd_to_le(fsl_chan, tcd, soff, soff); if (fsl_chan->is_multi_fifo) { /* set mloff to support multiple fifo */ @@ -515,15 +515,16 @@ void fsl_edma_fill_tcd(struct fsl_edma_chan *fsl_chan, } } - tcd->nbytes = cpu_to_le32(nbytes); - tcd->slast = cpu_to_le32(slast); + fsl_edma_set_tcd_to_le(fsl_chan, tcd, nbytes, nbytes); + fsl_edma_set_tcd_to_le(fsl_chan, tcd, slast, slast); - tcd->citer = cpu_to_le16(EDMA_TCD_CITER_CITER(citer)); - tcd->doff = cpu_to_le16(doff); + fsl_edma_set_tcd_to_le(fsl_chan, tcd, EDMA_TCD_CITER_CITER(citer), citer); + fsl_edma_set_tcd_to_le(fsl_chan, tcd, doff, doff); - tcd->dlast_sga = cpu_to_le32(dlast_sga); + fsl_edma_set_tcd_to_le(fsl_chan, tcd, dlast_sga, dlast_sga); + + fsl_edma_set_tcd_to_le(fsl_chan, tcd, EDMA_TCD_BITER_BITER(biter), biter); - tcd->biter = cpu_to_le16(EDMA_TCD_BITER_BITER(biter)); if (major_int) csr |= EDMA_TCD_CSR_INT_MAJOR; @@ -539,7 +540,7 @@ void fsl_edma_fill_tcd(struct fsl_edma_chan *fsl_chan, if (fsl_chan->is_sw) csr |= EDMA_TCD_CSR_START; - tcd->csr = cpu_to_le16(csr); + fsl_edma_set_tcd_to_le(fsl_chan, tcd, csr, csr); } static struct fsl_edma_desc *fsl_edma_alloc_desc(struct fsl_edma_chan *fsl_chan, diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index bb5221158a770..ce779274d81e5 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -238,6 +238,9 @@ struct fsl_edma_engine { edma_writel(chan->edma, (u32 __force)val, &chan->tcd->__name) : \ edma_writew(chan->edma, (u16 __force)val, &chan->tcd->__name)) +#define edma_cp_tcd_to_reg(chan, __tcd, __name) \ + edma_write_tcdreg(chan, __tcd->__name, __name) + #define edma_readl_chreg(chan, __name) \ edma_readl(chan->edma, \ (void __iomem *)&(container_of(chan->tcd, struct fsl_edma3_ch_reg, tcd)->__name)) @@ -246,6 +249,26 @@ struct fsl_edma_engine { edma_writel(chan->edma, val, \ (void __iomem *)&(container_of(chan->tcd, struct fsl_edma3_ch_reg, tcd)->__name)) +#define fsl_edma_get_tcd(_chan, _tcd, _field) ((_tcd)->_field) + +#define fsl_edma_le_to_cpu(x) \ +(sizeof(x) == sizeof(u32) ? le32_to_cpu((__force __le32)(x)) : le16_to_cpu((__force __le16)(x))) + +#define fsl_edma_get_tcd_to_cpu(_chan, _tcd, _field) \ +fsl_edma_le_to_cpu(fsl_edma_get_tcd(_chan, _tcd, _field)) + +#define fsl_edma_set_tcd_to_le(_fsl_chan, _tcd, _val, _field) \ +do { \ + switch (sizeof((_tcd)->_field)) { \ + case sizeof(u32): \ + *(__force __le32 *)(&((_tcd)->_field)) = cpu_to_le32(_val); \ + break; \ + case sizeof(u16): \ + *(__force __le16 *)(&((_tcd)->_field)) = cpu_to_le16(_val); \ + break; \ + } \ +} while (0) + /* * R/W functions for big- or little-endian registers: * The eDMA controller's endian is independent of the CPU core's endian. From patchwork Mon Nov 27 22:55:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 747651 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="L+Q7jJLL" Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2087.outbound.protection.outlook.com [40.107.13.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A7B51B6; Mon, 27 Nov 2023 14:56:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d0YYhXOGmbbXa502h5dr5/Mv3dehK4PAdcrngh8/S3hz4HGNobmiq2Jq/GH1dMX9woXxS5fbqGLm7dBR27s/CR+sAQQRO3CAebYqi6on25sf5frH64vOzGF3GViV8uiJhTb6Cesi1LJvrG6Mwp7gLnW9NVKF6v+qgtF4DfzKMZUoLgWU/VZaZrz+eOu3iS2tlsNp+GctJ/xMLkXalrlQPTD3qp6NwIIWY34PhIDVU7uOqIl+QvRubTElQ861Im3qYMieTK6JcWszYodisb7Jzp3fKVQGRx185M+jCbxeGCUuIekh46oWUqpv0utWGFUXJ9Y9vW6mmL9ArhZtHfHPCA== 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=IBP5q908Ng9LIH/wfPFsI3Scpoy1m/sgOEiCWyttsb4=; b=E5o8TtmNwBXiPeWV5e2SxhmibufXxBa3/6bnoSxLxvOdWIXsgf6P3sD5IlnmE9Vimedh7Y+OEgQGuFq3Vs7Pyy/TN24M21nY5OLo7ATtZbbbshEIvfT76X26U+N7ufqeonldfq196M5YqVCa+ljVZyRdCMUGLuU/2/Y4JOTfOqk7RboTEI0gmkf6xx3I1yxqxWRfwZ/6CAwIHjE1X9QIhVIVn7HQfyblt2WspQ+H6cGLJTuCBWVTz1bCMvBTsnHoIXTSZuia2Rdf3ZeWehzF3qC2Wfn3+KOmXYO1EXRZDXsf5vxtd3rqw3porKlBpRH+8aY5YlBggWorfhpARSzkKQ== 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=IBP5q908Ng9LIH/wfPFsI3Scpoy1m/sgOEiCWyttsb4=; b=L+Q7jJLLbjaXlvNzuGRvmKLHaCWgfVQBFmlEKTlyTmQ43d6r7rkK1LNAJSyQGpkT6TguMf2t3VJPc5uXoCbVr8UOsqXAv2gxv/2ukGcwPOtOLSve43SBkhxfJhVFPLWIw6/N/W6IJlyXkf+l2tvWWnQnb2UzsJxQekBdB3S8UrU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by AM8PR04MB7858.eurprd04.prod.outlook.com (2603:10a6:20b:237::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.21; Mon, 27 Nov 2023 22:56:11 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::95f5:5118:258f:ee40]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::95f5:5118:258f:ee40%6]) with mapi id 15.20.7046.015; Mon, 27 Nov 2023 22:56:11 +0000 From: Frank Li To: frank.li@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, krzysztof.kozlowski+dt@linaro.org, linux-kernel@vger.kernel.org, peng.fan@nxp.com, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v3 3/6] dmaengine: fsl-edma: add address for channel mux register in fsl_edma_chan Date: Mon, 27 Nov 2023 17:55:39 -0500 Message-Id: <20231127225542.2744711-4-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231127225542.2744711-1-Frank.Li@nxp.com> References: <20231127225542.2744711-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR05CA0116.namprd05.prod.outlook.com (2603:10b6:a03:334::31) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|AM8PR04MB7858:EE_ X-MS-Office365-Filtering-Correlation-Id: 03b9308c-5989-4e31-d4d9-08dbef9c0ccd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /B4jBi6CYUz9hdJqBA9Ywpv9plc486xKzPSqGCH9C5fUWtjWohfUFLuV7sHzuGsunQDBTsLniRuGMIAMOAMBKLS44km84xebSxaXHbXQwJObLNpJaI3Xo8I407bOrsMJ5ixp4oS8J0q+bJujeGvyqS0ciMdJQ6/NzD3EfB1eDH4RgjEOJexFoSjv7bhPYbZcvgiYgaepBZNRyzaS6+xRof86Y0+WuQJagbcbTqVwxTAFH8GD484mU6xGa/NDepMm2nyy7NikpqMEYp/xGeC48lm4eBtQm6Qggfh5fGIT7h0K1BQYaPA8x5d87mU7c1TRpqWDQTxzOwn620W7FoT5gxO05VUuVlmAoS6ANKKNh3G2MH7Mv1K05/KFyHZzGASfWkhmibhbCGrRNwt2IyERV9Oi6L5pzH/eBV1KaI6JWXUPspNXIYqZhvRVOsWVh9UUR2+zRHDio6/s/A/BJ8GLEp1aS+lH/CFBlbKqFBGECjRsx31LcgGfWencWr8jd518ZRyaA57HpEBVUUSRFYffEdbO1OaSUWrzxfOBKUxfDBbE5OgP7xOqi5Rz/MuKJfLLM8rz/5WYJXuZl5UCdL4mc6hc/alphsCi1aototGogF/D9MkhBp6ILKBU3iqEqiMO X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB4838.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(396003)(136003)(346002)(366004)(376002)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(2616005)(26005)(1076003)(6666004)(6506007)(8676002)(52116002)(4326008)(8936002)(6486002)(86362001)(5660300002)(478600001)(316002)(66946007)(66476007)(66556008)(38100700002)(83380400001)(6512007)(38350700005)(2906002)(41300700001)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WrqBtUZbVVZZajgLDblA4F+JyPEujvneT0j+/+ID0WtToulkrbkrabghxDT4SBSe6b/xAYO9oc2R9ibMkDqqUTecesAg4Ja9hypRMhAIzH21qQA6+2Wd2fz2qFN0vILHqe7HlHxqrxrWh2hpJlQl9/PSIW6RGS1O0Cmf1a98ATmwlvE0jjZeBdXIogaQvL/MxbljMZ4T6dz0bVynVT5mCYlICg4xadv8KNZiuHAiZib4FUBZdmF9HD/gpmtOKR5nNwVyMl+8oMW0DkkesqhmDh7esqz3zuLqH+OSKMWD3OCy4T2o66h43mmJPwdL/zBf967yP3m1tfgTxhyO6IUktnpOd13W+DkMkTiPTpWoXnSyii8BDe53V3SSNmpCIPPdz+mTnxaXNVD79syQz6TDW96whUN3nnDhejLYmbX7d8tgDLVHKQOe4Slse/bcYp+vUsv3NM2LOwAU3nhHjbuuvx0bsKnU/d5/tIxVgaIO23M1DDo00nIgngWqNYUzojl9smdjfiL4vG3wgff1qzaNd3ALL9KqagRQjuPOTRl1d8lmCZq5HTtt6kkQ+yC9XnwX8xRbFrMNQq83RX+0Rpg1hHBk6dZNpCd/zM/dchLKTd4BV06ETg0XI3g8WV9VRbLLN2of3LQy8hIGOKMekOOftz6U1N7QNoMbjG8vlydtnGtlKXO86XvFTqGVXcgY7N91cf/EP1bjGSsW1/rBLtQr4aSboezTc6KQf9QkKoGKlnZ9e8enbuBvbFCAefwTBkxQAe6eVj/oPyeQhPRBiWjJG2+oeWSStr399hNwoZ/+oMm2/WheVHxo7beQEbu1iInPAQwlnqceoEBwdOpq6OpE1QSP1WPrj5nz8QjERtVFSArl4z8nVB7CuXAExpA+OLT8XPr72soaiq4Z9GpaFTA3Es+js7JSS8btQWRWU6If39kZaV2iWdAAGnIsxNjHy85INNFZ7YHOc8W3XnANwIjqMw3pi68YKyQ2SiMPqS0UJyrFlL0nLZys0dXXTbuz/vIO0nLP82M9dToDuKRZaF6Wlcf/HSkzJdWn9bp0ZGCEm2AFBbrmU8ftF5yYELXE6BSDQx2D6dC9wK+O0OSPGuXir1GyipIyhzn2I5hpnnid3J77d9ublEmK3lTFCwNZ8atj3AVOFaLpjP9iOt7xP2urL8AOMItr6Tof5scGObMxwlndE2PqeIyL7uJxs8bzmjBrATSa4Jsjz50cPbpSuo8blCA8h+vwaruwrBCy4J9W1ZRU1QWppo1E49GNFr/Ixduv9QPsSBDRNhc+nKrKW4FrSnTNm9Mc3c7QfIa4a+7dtCm8OXaVIA10asiXmm6C3lyd2fT5/jB889AVVPx4Q344IL8T6lxwNeL2VU/EdBSizipzRYPJP2bgBjfIj3kBhSoaT4SRbwN9BBTDE2yOVF72b9v4+0tuTPScpafNMf2VanPw4TO90vLbP3VSOkkQrnfmk+9bv/rWtYrWHFxYJ+uFNsy4QlQxfKI7nE3gJ91iP1gnVd0bwrxQfG3TekUawgkI0XBrBPuc+DS5soTZkoegZwUx9DDfmJulXwFr27kvtiQ= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03b9308c-5989-4e31-d4d9-08dbef9c0ccd X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2023 22:56:11.5696 (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: B8x8YrbREG8KRG4eOXB7TECK+TiHMHzo4pPTnUH8sVfyOpx5p86Zp2atWqYTXQj4Myf3S9ya5mfMOs6ck/jxDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7858 iMX95 move channel mux register to management page address space. This prepare to support iMX95. Add mux_addr in struct fsl_edma_chan. No function change. Signed-off-by: Frank Li --- drivers/dma/fsl-edma-common.c | 6 +++--- drivers/dma/fsl-edma-common.h | 3 +++ drivers/dma/fsl-edma-main.c | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index 50f55d7566a33..65f466ab9d4da 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -97,8 +97,8 @@ static void fsl_edma3_enable_request(struct fsl_edma_chan *fsl_chan) * ch_mux: With the exception of 0, attempts to write a value * already in use will be forced to 0. */ - if (!edma_readl_chreg(fsl_chan, ch_mux)) - edma_writel_chreg(fsl_chan, fsl_chan->srcid, ch_mux); + if (!edma_readl(fsl_chan->edma, fsl_chan->mux_addr)) + edma_writel(fsl_chan->edma, fsl_chan->srcid, fsl_chan->mux_addr); } val = edma_readl_chreg(fsl_chan, ch_csr); @@ -134,7 +134,7 @@ static void fsl_edma3_disable_request(struct fsl_edma_chan *fsl_chan) flags = fsl_edma_drvflags(fsl_chan); if (flags & FSL_EDMA_DRV_HAS_CHMUX) - edma_writel_chreg(fsl_chan, 0, ch_mux); + edma_writel(fsl_chan->edma, 0, fsl_chan->mux_addr); val &= ~EDMA_V3_CH_CSR_ERQ; edma_writel_chreg(fsl_chan, val, ch_csr); diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index fb45c7d4c1f4c..4f39a548547a6 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -145,6 +145,7 @@ struct fsl_edma_chan { enum dma_data_direction dma_dir; char chan_name[32]; struct fsl_edma_hw_tcd __iomem *tcd; + void __iomem *mux_addr; u32 real_count; struct work_struct issue_worker; struct platform_device *pdev; @@ -206,6 +207,8 @@ struct fsl_edma_drvdata { u32 chreg_off; u32 chreg_space_sz; u32 flags; + u32 mux_off; /* channel mux register offset */ + u32 mux_skip; /* how much skip for each channel */ int (*setup_irq)(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma); }; diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 86b293eba27c2..d767c89973b69 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -359,6 +359,8 @@ static struct fsl_edma_drvdata imx93_data4 = { .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA4, .chreg_space_sz = 0x8000, .chreg_off = 0x10000, + .mux_off = 0x10000 + offsetof(struct fsl_edma3_ch_reg, ch_mux), + .mux_skip = 0x8000, .setup_irq = fsl_edma3_irq_init, }; @@ -533,6 +535,7 @@ static int fsl_edma_probe(struct platform_device *pdev) offsetof(struct fsl_edma3_ch_reg, tcd) : 0; fsl_chan->tcd = fsl_edma->membase + i * drvdata->chreg_space_sz + drvdata->chreg_off + len; + fsl_chan->mux_addr = fsl_edma->membase + drvdata->mux_off + i * drvdata->mux_skip; fsl_chan->pdev = pdev; vchan_init(&fsl_chan->vchan, &fsl_edma->dma_dev); From patchwork Mon Nov 27 22:55:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 747650 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="pEoSUnuA" Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2070.outbound.protection.outlook.com [40.107.13.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B20A19A6; Mon, 27 Nov 2023 14:56:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ghZEWoKOKeoIU+FI/DUK8OF5Wj3N1mCwYPc4TF+S2hyHe598+/PZSYT38s2hKmthlNlUhosreKMDdPieceFMkg7uBSUPonEBg6JIDVKp4iAWIp3dROuTDoKzWYbdf3Q+xqHyp1M9V2tht5VuvSh/NkUUxuu6cjZfFqQaGkhlquJCGYHIL78YaeUivKvtLPFfjL5YWB5PvqlsOtxFqxM0DVjCKUVfp8NsLwYPlV7xGCcjabjPdZFUeT7/Q3yp8WpgMPkZJP0tPBc5azWRyM5wBsVcx7WHosjj4N+OSgX4YJUb2CG/3wdq57ipoLtupGR98CpDS8QPswY1Uqqd0AfOaw== 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=bvWEH8TpUyOz5PnKH9wjxMICSByFjoiIVqDIjBVbGnE=; b=dV/MQdD6fzwj80mZvaIgEFH+R7fobZ+NFzat7g1LozgOhONnZqYZYA29mwELEERbB0TtFPoIl/Ub7ayRy61JFfyEz/OrKbz3xPw9nfiEn3PgQLtQ22DJpioSQP8SK7IC3+7aoL5Ybq55Qw2aP9dnFb7f8lU3dPciM4SXM2bHyfIiF0T+TcO3xV8QZVPcYusyXCEsx/Yq09CSU/65oIzdRhotLzjKF1+XW3bLDAphTEjSGxezbfjotK2Y/KtwaMYN1mY+j48Minrdr3YHyFAOLWgDmmAmwObC6Q2dyu0NINnftn+r1FkKIwT5T8LR14NH8gdsyVla+eiMVYgOxNvk+w== 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=bvWEH8TpUyOz5PnKH9wjxMICSByFjoiIVqDIjBVbGnE=; b=pEoSUnuAZuEsvBhYwNi37LwmGTkH6d8Ta/ZtVcxubvWgyXlKbQM7UU926ejdNSaP75O3Z+jkfr7KIw3/JLbszGfERXcxbJd7lD/BpA++m+UCvC+OfWxFm0Omj+f3hmIYLXr6kpT87gmueavJU1+BTNCmKiuMEBA8xNFTpLQQ7MI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by AM8PR04MB7858.eurprd04.prod.outlook.com (2603:10a6:20b:237::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.21; Mon, 27 Nov 2023 22:56:19 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::95f5:5118:258f:ee40]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::95f5:5118:258f:ee40%6]) with mapi id 15.20.7046.015; Mon, 27 Nov 2023 22:56:19 +0000 From: Frank Li To: frank.li@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, krzysztof.kozlowski+dt@linaro.org, linux-kernel@vger.kernel.org, peng.fan@nxp.com, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v3 5/6] dt-bindings: fsl-dma: fsl-edma: add fsl,imx95-edma5 compatible string Date: Mon, 27 Nov 2023 17:55:41 -0500 Message-Id: <20231127225542.2744711-6-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231127225542.2744711-1-Frank.Li@nxp.com> References: <20231127225542.2744711-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR05CA0116.namprd05.prod.outlook.com (2603:10b6:a03:334::31) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|AM8PR04MB7858:EE_ X-MS-Office365-Filtering-Correlation-Id: dad4bea2-468b-4f59-882f-08dbef9c1173 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mMGp3RRJDqaDeh8S/SAUiQsOW48gEV0QWxklI8LIKQpFmF4v8TPC2Y5PCxLuaOUpkL1MeZXT9m8ryFQ0a+byS9edAxh4YKub+Off74o5Ksb2rQnnPH305xxM/oF13QaUPxcZTqNhyuZ1xBLvRVUc6xIDfx0HqFqtuXLD3RCSlSIYggRM/1JT2yD1s20fcDd98A3aWsFM1AY8OyfENPXiBa5oOhVb3PCExHFSoWudPzwqCtGvsQ02UoPeEeCroDlw8ZtuBmR3yKkayqnnPyQ160s0SxRNVfkB6WSvfrHanyRQKUaYxTjHno+lwzeBRAXRw0ue97ql/bb+quLq/prLE6bfN2QznoQfwISJsUYTZMig2mXcK6sOS8GVx2O7QzrdJb5sKrNdDIov3v+sAJ0eLuDaeiGyla4SCC+FsaQTSUDP9eSQQKbIwNmjQ0xYX9G1Sn6ISz1lUsHOvx2M0UtemB4FZMbGBTC6dGSXLtjpSEisBwQP0X6Vp7Xz0gk+xKEnJj3s9Ol6fDxEwAQUQz+E89bXI0EEwQPydEV9eE3nj4WfK/5R2a0xXWySZvIt22JyRoArLr8BHoChiWxVBlaOyP/DHdFhKKgB7ZdDMxmCkE1790a/tRFOnVkGCnc7FoZv X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB4838.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(396003)(136003)(346002)(366004)(376002)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(2616005)(26005)(1076003)(6666004)(6506007)(8676002)(52116002)(4326008)(8936002)(6486002)(86362001)(5660300002)(478600001)(316002)(66946007)(66476007)(66556008)(38100700002)(6512007)(38350700005)(2906002)(4744005)(41300700001)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: luWGbVhPslpe0qqoNreIdakozAO8y6rw2KyRP7hbLPXTj8QUcPmIbkS/UeTrbIzS8OY3JdQes0bdll2YXZTl6z3Z2f2fYAbjBr4C2pm5fY7uM5ati+xw+wFX6y1sd0chLE3QOp8IPpy+OnuiucNt9y65lMFTKh8e1NAEgSPU75NETq3NYWA1M+s6jpPkauFWXcfDzceYaeA8bPLLem4IJf8gZ/SUzqPTej16iNHPQLEbbXxPOlXOQ0rMtA3KsBI5CCayOFXdvFhFBGF6QADA18K9+A2zq2kU9DVHZ7IviU3qbsEjMDsjdtSWCOs8m3xKHZaASIuKvEAzGVi+qby4C81AolCMcZdWJNRJjk+b9yKJrOEqPXQNQ3wtqq7CmDJsTx2fne2Zd7YwRDxtzK0yeP+Z2Tlk8yV0sgM9EdKDctoy7B6b5YcLhcRsIVMWgalcEGuyMkCaUF/DpCr4oKg3wWSwuMAVZAdo56OSgIgBV27xYgGe3Itf5RIHhJvwHE/lb3YXM3N1FsnCRY+Mtz8nmhiqA79+4bANZ/hTP9/m+RCuj9P4/SiCMB4X+UJeta2MKPB7/1hbL4VZIwyaTIbF2ntmvyq+RNq2cwqmYDCb0qs/7ZqNgzztC8ldOe86j/GKqdu3Nfsh9+U9IYVex9L8qTUWVP73aFEBLmszmXfs7Ee0lF2M7MWQ4v3gRPe6YhWercFaK9PORSNiYjzvOhZ2wN8AAhBsP9TwtqUuw9lSrijr6jVnZsIqxgGayLq0nj88RH2Y8R8Az8yL3RI3lXrdyRxFIKnVSWLNkT9KBi2ehn8iBN8yXd+pfUgt8TC7+GWPGXl2DfznWBLNAS71ah6AyZfGwguSXk8OVtPyt35APoQuwz7F15xgu+jASmQyo65N2z5ghbgSiqgZksyxQuPFHbvR56vtf4rSKWk1QmKigyDWVOfYHYEmqRMr9rYGtFd2nTnpSLr/XzQgfmz0xaKKPiwZ1y6WFKCRW9mfI61QQBPmLLJMFmaTjK8BGzo/LrkgadU8CMeMPpaeeGZYcpTmaAhub+3Wv42UCQuFgxznoRF65TExux1Gs8x30GbwB8qmynWAshMmWJPOuZwfO0QuDqJMGAh600+Ebn3mI00ynp2axYt3jxiYTPhZDUu4bOWeZmjRvywg429rHfIDa5tV1fn003Q/DiCZN6jzb+iAPpSLtDwBPTrRSQLgqN2eFzkaeZw29vk4QvK2Vbyw/hfP5kEh16dZefTKr0bCQXLXcYYGUL2g2vNae5o8nNKLIJpYG95qk5BXj+xYW4ScpMEa+Xh1dLcQIZx46c2NVrEDtihfN6ryyyhRXcq9A6Vrq27PsZsIsQhIKzJN397Ln5+6QMnOX6ZqNzlyvGIvECAIFRL/r0AcwmlCTWrfen/ivgobjt5gHRSAvCjolnIFrVx2DV160hsEj4vwJGY8g1IggKmGZ6DHjojfY+4jmf8GROsTZsVhmg+mpsmpgwcy9Fx2F5KOhX9+Jj8zUcI32HUCMPyAFHvq7NCa61wIXnOkv9zpLOOcnFuZCOqBZMl69/YMY1wyOyMc6DBYO2qjRqyvp6Y= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dad4bea2-468b-4f59-882f-08dbef9c1173 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2023 22:56:19.5303 (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: hCeIcnKVdPicsaQrkQsggKd/keZpVY/v/AXI76+ht8ffoL13PRNxP54sJEh5Kq0Si5JNDLRiFfKdzgRiXv541g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7858 Add the compatible string 'fsl,imx95-edma5' to support the i.MX95's eDMA, which features 64-bit physical address support. Acked-by: Krzysztof Kozlowski Signed-off-by: Frank Li --- Documentation/devicetree/bindings/dma/fsl,edma.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/dma/fsl,edma.yaml b/Documentation/devicetree/bindings/dma/fsl,edma.yaml index 437db0c62339f..aa51d278cb67b 100644 --- a/Documentation/devicetree/bindings/dma/fsl,edma.yaml +++ b/Documentation/devicetree/bindings/dma/fsl,edma.yaml @@ -25,6 +25,7 @@ properties: - fsl,imx8qm-edma - fsl,imx93-edma3 - fsl,imx93-edma4 + - fsl,imx95-edma5 - items: - const: fsl,ls1028a-edma - const: fsl,vf610-edma @@ -83,6 +84,7 @@ allOf: - fsl,imx8qm-edma - fsl,imx93-edma3 - fsl,imx93-edma4 + - fsl,imx95-edma5 then: properties: "#dma-cells":