From patchwork Thu Sep 1 01:59:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joy Zou X-Patchwork-Id: 12961663 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2D6BEECAAD4 for ; Thu, 1 Sep 2022 01:59:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=+kiboVDaCfzKucOgpyffAm20/IgFesvFuhYxcxCYKss=; b=I8Xv3+hxLkoYOF Nh7jc2kIJkDzZ4kObFCQeF/7O436Mc4n/3p1IlwGm9oPM3+lGq31FTk569pZWdKe+zmWBlibzj4Hg 4Y64zaUFSEhECi9EJycj7Ra8A6ZvNb1eQU2cuy+GgmEtru4gHEzH1zN5GbpeFzIPIjggrgyFbQ0Hy 6dlij5QKDykc02b/ERTThE15wVWwyDatm9g5KDlsoXrtvOXwgca+iF4Rx02DzKG8De63a/adjaUQo t9XiuhqI8+43LFW4RdZ420M/GTFaEu470SDOgJfIbNCEcmx4YydGaMUO8ZSP0PC/3HVrFUt5fjL/d becJomH8PXx8wSzxUwnA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTZTH-0094OH-SP; Thu, 01 Sep 2022 01:58:20 +0000 Received: from mail-dbaeur03on2068.outbound.protection.outlook.com ([40.107.104.68] helo=EUR03-DBA-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTZTC-0094Kz-5q for linux-arm-kernel@lists.infradead.org; Thu, 01 Sep 2022 01:58:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kqy7Y1h4tz0KGpsdafjM4OQvYoNfjI2yMm2e1gZk3PVcTtl2VorR0HfxygiBHNas/S8GPi6SZ2pA8Ml3jh5sTAkTGLKxBO9tULMCJXX+drwbLt5pmRieaYMwpqD1lg0TPMzrO5rqCrTXz0aanCuBxdzTeVGs/nBCGupqj83KqvSe2OC/Wya6Hsc9S/E/QfFKWqa/EAql/MNenaynYFJ7I0ISg8i0R6/zzzk36GqKN3fPLnPVaUKQ7FM8L6EFlsw/OGKtb/b0crOhZMs9CHfmpC484rzvHBL21fID0cT/LWT5EAbUxhgQBDW7AZeNVuloNGcsqJ/GUfUM62XM6wQLfw== 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=HvWlg40vwXJzY6Xfy6woEqPpdEVg+izr318OLEXi8+A=; b=D+8af6VGchlsnwpZ4ip3u6jtvvKQH8wUILHNze14Caeeg29dvtpoAuPw0me3fSqHaVQ8jnPOuDofNqgQ8KowIaO1HCWKrMsj/qR+bN4OINawH/fApPXgjpzp7r/Q9g8X5PqPWjVODdJtEpbfM4Egzcmf6465hheO/tigvj72cdqXSd0uRSCYhrVjGHYiv4OPwModcpDoS6qCdjJv8FWo7Rkj1S57Y/wosWup4eBZ55V/Qz1umyRS6pmgxkkzKD7WBnhKHgEN9LTmT9NXuxI7ZkGdrj9y8vsLgNewPjKssL0IgH5kRhacP5kF1eyogtPZhvqEeK6En/5oubwoDrMe/Q== 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=HvWlg40vwXJzY6Xfy6woEqPpdEVg+izr318OLEXi8+A=; b=CKpyvyEPH9D+C3xj1Eqpsbci5a8WtcQxkOLd7AEfsZf2tnHzQT42gr9Kb5azNvY3VX3AtPIjnEMb+YMP2IJfvsFYql43SXDb3L7/9C5V97hdCE17LTQ/vhhi74Xm1kfR45ymBN2oCU55HUgB+/shVfUyoDu0DBkllRGnh6wIgVg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5925.eurprd04.prod.outlook.com (2603:10a6:20b:ab::19) by VI1PR04MB6159.eurprd04.prod.outlook.com (2603:10a6:803:101::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Thu, 1 Sep 2022 01:58:01 +0000 Received: from AM6PR04MB5925.eurprd04.prod.outlook.com ([fe80::704a:fa82:a28e:d198]) by AM6PR04MB5925.eurprd04.prod.outlook.com ([fe80::704a:fa82:a28e:d198%6]) with mapi id 15.20.5588.010; Thu, 1 Sep 2022 01:58:01 +0000 From: Joy Zou To: krzysztof.kozlowski@linaro.org Cc: shengjiu.wang@nxp.com, vkoul@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma to DT schema Date: Thu, 1 Sep 2022 09:59:26 +0800 Message-Id: <20220901015926.50082-1-joy.zou@nxp.com> X-Mailer: git-send-email 2.37.1 X-ClientProxiedBy: SG2PR02CA0072.apcprd02.prod.outlook.com (2603:1096:4:54::36) To AM6PR04MB5925.eurprd04.prod.outlook.com (2603:10a6:20b:ab::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b92df860-aef9-4e82-7551-08da8bbd666b X-MS-TrafficTypeDiagnostic: VI1PR04MB6159:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B+01TKJnOIG4O0yjzaBAn2qfjFVgzOf5+sNnGGQ+RX29dVmWO1Pun9HrmqXDWHlHH0C82Iv9VSITs7LGC3hol8mXtQW8hirT7F9V9Ubm0qfCM9FNDurZF/7ByfQFoAlEny7w6gc04aU0h8AA6lj5TYmYlDom1T0u8gEt1sBknva6ZcJW8FqPLQuqN2d3nhS5iQ+XXuqypzL5HRT7hJF2ZQA5eoUqRzm1kLw3fWx0uuk7TrLxDG5xB0IGFUiYV0VPkZuhyvOOt/1125xbGOHwaEv9QzXQ+SQn2b1sdH1KXyOVVaeDbmtOWYzFcIDM1+s5Kr5VbEipoK9SAPaj3opfF7PIMj9CdHGokkdgiUTiHeINcSv5KRN7xPth3nTVAaX2pHC7WX5s+E56CfX46CyE9JTI34EM8BkhwLZ3svF9bY/c2vNJD37haRZU/nSQfLgAVW+/EYBcQMj4HJsaRpLX7NdsJ/q/X5L4phDQ+c2hXEMeI2pu+8wYC4DAN/juzMaBexg3INA9nhsgAkCZZcEiZFsn4HnDIz6jAt/wP/2B7pX31Xlc8/ujKjQOXru6W22dIkft7OSxIJErniSpQPeUEPEvnPkG6VIihUu2g11Uo0DMT97hBXoxuoP483wG8WzKMfqbBLXGqjHoMYFj0RBGvByNg6DdaXUfLeEtkArbJJYO8ukglRUyJ0f7WmK7iryjRw3UwS8Rr54uz2Pu1PWa13eIJ38Oki2QVhjtI8NS/nlnHE+Ihmnhr4FewQivfc+L4ehSF6ewhgABvi5FqSPNBYhvWTqglJgPTnXd+whdzj6MaC4d8kcL7P9Va4Sy4OG/1z/lU4H5O+7tzyKfWAwxtA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5925.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(396003)(39860400002)(366004)(376002)(346002)(136003)(2616005)(1076003)(83380400001)(38100700002)(8676002)(38350700002)(6512007)(6486002)(478600001)(66476007)(966005)(66946007)(66556008)(26005)(4326008)(2906002)(7416002)(5660300002)(6666004)(44832011)(52116002)(86362001)(6916009)(316002)(36756003)(41300700001)(6506007)(186003)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M+OyquPZKCciAhmHYayRECnKZ7eysJoKJYsqiZFM97aom2p3R28pTEj5UUzNgD6WyF9txifL0bt/Ka9Hg9okaEiSJ3F5UjeGf7c40FxzPjc8WUpeK1witQYrf3FgSrlv5aDoP4uPQQRSD/mxzVFft/MmXashJsh8LpRvBhRDJck37NWocPGh5tc5Je4O9A7KjVyqPw+eq4osCJCkKjns+AS4RiV3f0jPA20nqlNIgdh0m8zem/m0bfX+xBfvs3qlyj9jpr6UPtzJXnsBXj+eTUm7qDFHgziGEl2U+qHjzhlUnJfFAkbIKkGwkEdF8lTesa/Pil+hqkcUeSsEf0I7kE8KgUBDYe/IhEH+zguHz8ahfdUrVphwdACEPDO/GsQ0//qwX46ra3/Kk9ZXiBYnR3m6SzjIyIHKzdSTGSMw2bg9E3xZCcs8SlqxTcClP8xhlX9CpIHWRL79RoXZdred62bN27oFHmQFzV2GLh0SvwCn5YpkTZgeQcFHYEq0vu+doJGgVMmX/MeZFN9L7u0Z85qKPgvJ1OAWiKidKWmrlSlrrkPyoFRhnH6pisvMTFrm3eIwu9yMC6B7/qRsfUz7ZFab7hijoQRua1vlSgWO0q5Vb0LAPJ4oGv0lC4rATcZeT5ph88Jzpc/sEjNYAOVDSayvGpU03/EPYKdXh4cDDXqHgCO9UecSRlhTE5lP9NQz2C0Hb6o1+kA6qOobsXK4CiYKD69IjbbD25LFLMT4fSO+m79dTQsDxVBMUhSoygOaPQOkf+mm6WwAlpk378tBthwDLllGZn7iAPIJMwZRcH3GrcV7dLAJa9rJRwKTjpaxMiXY83AOQ/HKyIc1dPtmFPWRx4A/+7HjNLyij2wTLxY8YvYRzho8CaK/bAmldWBGk5VVOl4Pr9xXiwu4mmDwWhdhv8JVhIkavGatRqWj6Ih9eg54FfE1/28WT5c8vD3td3kPUlzNyKITyk45+nQZZ6IjJ/80LMiXXaRoBUu/yBEUsDne5aj9KiDkOnpmBeoYdBBnSHYntjDpEHrBfSis3WpsWclIKXjGCwfhGhiegxvVmnKHe57X8aG9P4LzVTDQxvTbtNtmgcYdEfjmgfr/54D6EehV8l4HqrI72VhZ/e9ON8cRYCSwi5XWeM6osvsrGZjuYWq/rBLSVO7WqMMLbHRNqYyGbSxM8yKvX7/qW2F6OyOR6GiSBBaUx3lex+ikxrU/yU2K9Knc7OCQ4TjCtURCFWXnOCcnsUGpqIXEX0XDBmQ9wbKzEKG9n5QWRtn3eTt2phYkg1SQbq+ZcVp/798qXDiZiNtBXy5Up17e+f1puQXSL90pcy23OXvvHqcebbjOqmaJqqxn9uraLHOeIdAY3UEo3JV3xnu0y8rJ0ISsGFhSASnw1fePFjo+gi5UfkuTNMgUbec5UwNvPuXBC1L5h8s+tIksjYolRQPGwMc6JRSh/Wt9AeOqiEC3xNGzjeNpjHbSZ3tpKfo8Oj8AOmGDwhD0pqWMGzlt6Az/kcbQ5TrL6tFHKr+bvot+oFRBA6WJD9qmtvHCCezSQOBzUvyp7UAzQHZ+kOg3o2w7o8H9SEfWNMcdmFWCRglsPkmS X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b92df860-aef9-4e82-7551-08da8bbd666b X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5925.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 01:58:01.3338 (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: aKYl7A9RAde1Xanqmg+L4h4n1E/o8udRzAwdGbq+PBYhjaDP6pBM1s5edXL9HKR5 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6159 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220831_185814_430066_867170C9 X-CRM114-Status: GOOD ( 19.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Convert the i.MX SDMA binding to DT schema format usingjson-schema. The compatibles fsl,imx31-to1-sdma, fsl,imx31-to2-sdma, fsl,imx35-to1-sdma and fsl,imx35-to2-sdma are not used. So need to delete it. The compatibles fsl,imx50-sdma,fsl,imx6sll-sdma and fsl,imx6sl-sdma are added. The original binding don't list all compatible used. In addition, add new peripheral types HDMI Audio. Signed-off-by: Joy Zou --- Changes since (implicit) v3: modify the commit message in patch v4. delete the quotes in patch v4. modify the compatible in patch v4. delete maxitems and add items for clock-names property in patch v4. add iram property in patch v4. --- .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 143 ++++++++++++++++++ .../devicetree/bindings/dma/fsl-imx-sdma.txt | 118 --------------- 2 files changed, 143 insertions(+), 118 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml delete mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt diff --git a/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml new file mode 100644 index 000000000000..18b31758cc67 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml @@ -0,0 +1,143 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/fsl,imx-sdma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Freescale Smart Direct Memory Access (SDMA) Controller for i.MX + +maintainers: + - Joy Zou + +properties: + compatible: + oneOf: + - items: + - enum: + - fsl,imx50-sdma + - fsl,imx51-sdma + - fsl,imx53-sdma + - fsl,imx6q-sdma + - fsl,imx7d-sdma + - const: fsl,imx35-sdma + - items: + - enum: + - fsl,imx6sx-sdma + - fsl,imx6sl-sdma + - const: fsl,imx6q-sdma + - items: + - const: fsl,imx6ul-sdma + - const: fsl,imx6q-sdma + - const: fsl,imx35-sdma + - items: + - const: fsl,imx6sll-sdma + - const: fsl,imx6ul-sdma + - items: + - const: fsl,imx8mq-sdma + - const: fsl,imx7d-sdma + - items: + - enum: + - fsl,imx8mp-sdma + - fsl,imx8mn-sdma + - fsl,imx8mm-sdma + - const: fsl,imx8mq-sdma + - items: + - enum: + - fsl,imx25-sdma + - fsl,imx31-sdma + - fsl,imx35-sdma + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + fsl,sdma-ram-script-name: + $ref: /schemas/types.yaml#/definitions/string + description: Should contain the full path of SDMA RAM scripts firmware. + + "#dma-cells": + const: 3 + description: | + The first cell: request/event ID + + The second cell: peripheral types ID + enum: + - MCU domain SSI: 0 + - Shared SSI: 1 + - MMC: 2 + - SDHC: 3 + - MCU domain UART: 4 + - Shared UART: 5 + - FIRI: 6 + - MCU domain CSPI: 7 + - Shared CSPI: 8 + - SIM: 9 + - ATA: 10 + - CCM: 11 + - External peripheral: 12 + - Memory Stick Host Controller: 13 + - Shared Memory Stick Host Controller: 14 + - DSP: 15 + - Memory: 16 + - FIFO type Memory: 17 + - SPDIF: 18 + - IPU Memory: 19 + - ASRC: 20 + - ESAI: 21 + - SSI Dual FIFO: 22 + description: needs firmware more than ver 2 + - Shared ASRC: 23 + - SAI: 24 + - HDMI Audio: 25 + + The third cell: transfer priority ID + enum: + - High: 0 + - Medium: 1 + - Low: 2 + + gpr: + $ref: /schemas/types.yaml#/definitions/phandle + description: The phandle to the General Purpose Register (GPR) node + + fsl,sdma-event-remap: + $ref: /schemas/types.yaml#/definitions/uint32-matrix + items: + - description: The GPR register offset, shift and value for RX + - description: The GPR register offset, shift and value for TX + description: | + Register bits of sdma event remap, the format is . + + clocks: + maxItems: 2 + + clock-names: + items: + - const: ipg + - const: ahb + + iram: + $ref: /schemas/types.yaml#/definitions/phandle + description: The phandle to the On-chip RAM (OCRAM) node. + +required: + - compatible + - reg + - interrupts + - fsl,sdma-ram-script-name + - "#dma-cells" + +unevaluatedProperties: false + +examples: + - | + sdma: dma-controller@83fb0000 { + compatible = "fsl,imx51-sdma", "fsl,imx35-sdma"; + reg = <0x83fb0000 0x4000>; + interrupts = <6>; + #dma-cells = <3>; + fsl,sdma-ram-script-name = "sdma-imx51.bin"; + }; + +... diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt deleted file mode 100644 index 12c316ff4834..000000000000 --- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt +++ /dev/null @@ -1,118 +0,0 @@ -* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX - -Required properties: -- compatible : Should be one of - "fsl,imx25-sdma" - "fsl,imx31-sdma", "fsl,imx31-to1-sdma", "fsl,imx31-to2-sdma" - "fsl,imx35-sdma", "fsl,imx35-to1-sdma", "fsl,imx35-to2-sdma" - "fsl,imx51-sdma" - "fsl,imx53-sdma" - "fsl,imx6q-sdma" - "fsl,imx7d-sdma" - "fsl,imx6ul-sdma" - "fsl,imx8mq-sdma" - "fsl,imx8mm-sdma" - "fsl,imx8mn-sdma" - "fsl,imx8mp-sdma" - The -to variants should be preferred since they allow to determine the - correct ROM script addresses needed for the driver to work without additional - firmware. -- reg : Should contain SDMA registers location and length -- interrupts : Should contain SDMA interrupt -- #dma-cells : Must be <3>. - The first cell specifies the DMA request/event ID. See details below - about the second and third cell. -- fsl,sdma-ram-script-name : Should contain the full path of SDMA RAM - scripts firmware - -The second cell of dma phandle specifies the peripheral type of DMA transfer. -The full ID of peripheral types can be found below. - - ID transfer type - --------------------- - 0 MCU domain SSI - 1 Shared SSI - 2 MMC - 3 SDHC - 4 MCU domain UART - 5 Shared UART - 6 FIRI - 7 MCU domain CSPI - 8 Shared CSPI - 9 SIM - 10 ATA - 11 CCM - 12 External peripheral - 13 Memory Stick Host Controller - 14 Shared Memory Stick Host Controller - 15 DSP - 16 Memory - 17 FIFO type Memory - 18 SPDIF - 19 IPU Memory - 20 ASRC - 21 ESAI - 22 SSI Dual FIFO (needs firmware ver >= 2) - 23 Shared ASRC - 24 SAI - -The third cell specifies the transfer priority as below. - - ID transfer priority - ------------------------- - 0 High - 1 Medium - 2 Low - -Optional properties: - -- gpr : The phandle to the General Purpose Register (GPR) node. -- fsl,sdma-event-remap : Register bits of sdma event remap, the format is - . - reg is the GPR register offset. - shift is the bit position inside the GPR register. - val is the value of the bit (0 or 1). - -Examples: - -sdma@83fb0000 { - compatible = "fsl,imx51-sdma", "fsl,imx35-sdma"; - reg = <0x83fb0000 0x4000>; - interrupts = <6>; - #dma-cells = <3>; - fsl,sdma-ram-script-name = "sdma-imx51.bin"; -}; - -DMA clients connected to the i.MX SDMA controller must use the format -described in the dma.txt file. - -Examples: - -ssi2: ssi@70014000 { - compatible = "fsl,imx51-ssi", "fsl,imx21-ssi"; - reg = <0x70014000 0x4000>; - interrupts = <30>; - clocks = <&clks 49>; - dmas = <&sdma 24 1 0>, - <&sdma 25 1 0>; - dma-names = "rx", "tx"; - fsl,fifo-depth = <15>; -}; - -Using the fsl,sdma-event-remap property: - -If we want to use SDMA on the SAI1 port on a MX6SX: - -&sdma { - gpr = <&gpr>; - /* SDMA events remap for SAI1_RX and SAI1_TX */ - fsl,sdma-event-remap = <0 15 1>, <0 16 1>; -}; - -The fsl,sdma-event-remap property in this case has two values: -- <0 15 1> means that the offset is 0, so GPR0 is the register of the -SDMA remap. Bit 15 of GPR0 selects between UART4_RX and SAI1_RX. -Setting bit 15 to 1 selects SAI1_RX. -- <0 16 1> means that the offset is 0, so GPR0 is the register of the -SDMA remap. Bit 16 of GPR0 selects between UART4_TX and SAI1_TX. -Setting bit 16 to 1 selects SAI1_TX. From patchwork Thu Sep 1 02:00:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joy Zou X-Patchwork-Id: 12961664 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3CE51ECAAD1 for ; Thu, 1 Sep 2022 02:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=4VjUHKAFHQnbzHXtdqNAasJfEgHOrRmh+LprANDMVKc=; b=m0MtF341v2HKFI Nc1ZUvVd/DDHo0O8FfFeGiXRANt1F/espJZV5wWPui/s8+Ljmhj3vr6GLLOvzh8QRgjNGZxdA0Au+ MSPzvPa58i1nChunSSKF/QnXRIheUfCG+AVcQX7Pqa9B3AH+COgFcCQHctwEFl7wnl7U4iGCpya4y yz9W2HjSlccqHbcMrUmvHPF7+EsExnnLzy65yz3cM/p6xuqDZ5+CZWBf2KiMGg8trCp41+mwEbCSP 2KyNhHkqj9zvPDGqnowemxlQKV/oqlYpBO23K2L4vme1K3um5w7fqeklsmiFIeolfQAlj5ftbkecx 78FPxKrFX/FNgb2sLo8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTZUg-0094mi-K4; Thu, 01 Sep 2022 01:59:46 +0000 Received: from mail-db8eur05on2041.outbound.protection.outlook.com ([40.107.20.41] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTZUa-0094jO-H0 for linux-arm-kernel@lists.infradead.org; Thu, 01 Sep 2022 01:59:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nghxx9rGnrmGxEAue86vVEpOXJaRlDeGQaX1o+DPKDr3rCWSQaW2nZBrn4OodJM+W80fxTA96hCIHsT1Fe5g7u35IdAZ6cnxHqWTxxQ50lQtEZtyyetTHD+LzMJlMiH72ZAorsQsb5L6swgE1+vk1laGdd4IQ5kfI628dbvCtnJSNSk00b+b1KRO66oWpaqLK7i3WW5suBvmtq0Jax8Z/xCFS0NJGYIRS95ylEhS5B31n+iWv/UCPLv6OD20g7/13NjGZCCXmHH2MsXkFAiL2tc1YR2QfDDeMXNMWJgKTiVM7mrcyJomwy1lBQvYKigUjtm0QWPRhXWFg4QafXNujA== 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=IT8qLsWtASgU+jrkmCjIv4P320Habx7fIb/JbroiA8E=; b=MDRjYAPpnExH1JDwZp575I8luiKZpEt+6hzWmn6b6dNPLLr9BOYOUlEJalTFoAbK/ODWbzsGO4e0bzo8wYLIUVLiBTLJGzlznoRB63H/hxA4y2sq7PGdVbnsgpFz2y29TQepOBkGR+1mCogJ4YKcdsh84gmtc4wrZpSabDxWD3UA3CNFRke+CRkO5OhkzKRxclt3aue6zQvzvO0qAYjDP80NSFmVnxqriixLdhRlWancsDIAYRZ5JKuSbcYffVqgXB+QWvfux9LKDAFv707siiScLxuBdjvroSSSweq6gx66MjS5aaiyHYtW67jCwLuNZxsj+ggOu1g9eBnOtBnTXg== 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=IT8qLsWtASgU+jrkmCjIv4P320Habx7fIb/JbroiA8E=; b=abr1r2Qne2raORuqtHuzaqp3anNfr8blz6ygAlbFBnZvXU8CUf1BFjV3V/vTdgnY7YLGW/SSSpb3v8NPFGolcQbfcTXXOCD/UK0cFuRvW70y205ymL7gnBpIAH5EQzEfx5aRLBEfzdI/Fy2Vadm5hcqifkDmnDgzpIMGMCVoKPA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5925.eurprd04.prod.outlook.com (2603:10a6:20b:ab::19) by AS8PR04MB8724.eurprd04.prod.outlook.com (2603:10a6:20b:42b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.11; Thu, 1 Sep 2022 01:59:36 +0000 Received: from AM6PR04MB5925.eurprd04.prod.outlook.com ([fe80::704a:fa82:a28e:d198]) by AM6PR04MB5925.eurprd04.prod.outlook.com ([fe80::704a:fa82:a28e:d198%6]) with mapi id 15.20.5588.010; Thu, 1 Sep 2022 01:59:36 +0000 From: Joy Zou To: krzysztof.kozlowski@linaro.org, vkoul@kernel.org Cc: shengjiu.wang@nxp.com, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 2/4] dmaengine: imx-sdma: support hdmi audio Date: Thu, 1 Sep 2022 10:00:59 +0800 Message-Id: <20220901020059.50099-1-joy.zou@nxp.com> X-Mailer: git-send-email 2.37.1 X-ClientProxiedBy: SG2PR02CA0034.apcprd02.prod.outlook.com (2603:1096:3:18::22) To AM6PR04MB5925.eurprd04.prod.outlook.com (2603:10a6:20b:ab::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5abd72d5-4998-4dd7-66fe-08da8bbd9f30 X-MS-TrafficTypeDiagnostic: AS8PR04MB8724:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pnEB2zwbi94ibr1AAKo87IhxxMd+M4JGO57bSzM1PFCIpqt14/fQGmpOSDU63eHj6eddPla0HkjKICmu6h4Z7LA9ARAq2PeCWUULIgequKLu8v1BTQNB6BmHqC7xjYDGVXa6pR1H5e5h+Jjf1bwHKn8zhEjCCinDHWEtcu+fwaqBh6ryjjB4VLtOyt/1BQw70Em9hzp5ZvdQpUCQcl5sfaSsG8L3J1XVyfjTkhAwiQ3taeQLgdQyTQIuvmksYGCMLGfVQ83qka3PtYJO3+8ZNVhACWhlMXNcB1GNH9AKtdoYxPj255IBSiMSnteWfV0ONFRYSObtfpmbmUYCJ072FSD2N37EGF9FEIDHGPQ6/isA+br7c0/O+c5jvyrvOcK69ooWEERFkODNlYpI8r2rhaBniSxee1xOLZ3ENT1c59e+39irfDNa7thAjiDQ33RQXqboTv2+9cCg4TVfervZ0m9mL8I7FUKx6iz1pamt/DDhjUo7np8CQNxQOsf2a08fuizLYPYzlcdH+2aKcK0R7zhfGv5+fxc4Nm3xUR7c5ScJX6E1W1/8blB1sqTLkwcxrodAqN5sZWhs/DAAulQFMDUwBgBvmWoAzhwaFU0rb7/CtDNTetZMN6WsiG4GMGMHJibj54GsD6aJZtp20RZ1NPS7L3vRtMRYtsFjjO08hdjUWdo3Zls/Xvd6ETu6XWIINeGesb63bft8WltGjAaVbOE+dPB7sJNX1UQ1YL9CvbAXuhJA0oOIBgZB+USlINP8fGW0P4upk/DC8iDGlKH40Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5925.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(39860400002)(366004)(396003)(376002)(346002)(8936002)(4326008)(8676002)(66476007)(66556008)(66946007)(6486002)(478600001)(26005)(6512007)(2616005)(1076003)(83380400001)(186003)(6666004)(44832011)(5660300002)(86362001)(52116002)(2906002)(41300700001)(316002)(6506007)(36756003)(38100700002)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cKM3fKASlVr8i/fmtU+T6c1XsDmLhP2alC7tn8L+1AEbNq3SodT51qKy0+gfR990QH3xl7s9D/9VQ2xw6CfU9BhSNE1Iz+txEYCsTnNi0KrRjbuIh0UZ2r7v0S/CIr6OvqQauaVtZBhR4wI2Wc6UlG+iPnFPAvd/9bHEZDcXTc1TEMMQls425L05ISoD+JuZU5onCGdpIsgOc0sNZQCRKxwotohMxmdprzRf/31eDQTyUxX9/WM9sps+9Nm0XPG2KtUlJljDcxKnGjU8L5Bc/Jm9JMCC4NMcX7oCkiaU0eAAm0qxMXLuWlHuWTebV7EhkAs4fqQjT3RYWemIY1REZokEVyUBQCn7Z3ic0vEhGaOpWmcDj/szjeyQFGAzp6p4SqNG4BtwY4tycmFcbSnZ17aRgI4jK6xHaEwTxxFqUN1hy7rmhiaZ9uN5SzyQhVezxlBPQ4vyEiBmAuFMV8fFE0TnF6BpV4hVQECPXkJSPXuhlRWUW0FfiBwdoA86NQAGJjLujQte4t5GUThRrc7Hor3xsQvfcotlAizHPSHX4iNA1zAOu5EIomRDcVwJ/fRvrQiTNNQhkrIIzuLnNqniZUPMojzQ1w75sjQ716Ko3uIcoMWRF5Mu3XIsXvisOn/9FKGoIBucPKy88CdeQ6Cx8n03CTzmQyEYK23d01bI5zb+Fdb/Il2c3bWi46JuG6utNCJOt5+7JsRPxheCOphXgQlNDKuEmwyxMkkWrWGOoaCJfuEDKeh2W/rrS9MjosSE0W/QF5zQwh64GhbL/UWq1v5s/TDt89iTHaH86VF9JD+RL0fB2rE3pjL/qevQPL+/ee2TuDJ+TYlWvNCX/bFrF45mqkErCKZX7H3RJ9Ka4G/kcu8/vNgj/T1QX8Pr9EJBEMGCWhkxCYYvO7iPCSw577UetJJdxgIQUZRzuBShZwNfe2GF2bLxgxwR55UHlCqDW5Yx6N3L1V9kTykzYLWXVxAMj984rQe4vEjvELnxyxotte+76MSEk3cP4RAXmugsJGq49ZM33R/WfWdj39s4XImtYrEK621xDiAV4ryOUfkQg7OPfKMnFUa4grEGdZ5YroTQ7jc6VbiWKjEHrQW7R1uZP9/ieBCuJYT7edG1KU9sql6YejA8Q7XqUOu2U4nAq8a9hNOMIF1516+tIln3GAo7QsUMFlymOE8rA8Wvsj41o6uQYAkbPf8jpy02wFvuTAM0sgxDYIklLag1qA/FKGP03vLO3yqFV5fjiqe6zM934S76Jj18U+zX9pLclpoijp0voh3gpUSK9JHZgbdIvybjjFlVMJBYWqTN/xM1MnuQ1LwtD+kQGDABjReMjClSO0nCCc6L/oM+Ky+QlsStTJJ93LI/pq8/4+B4YBkEVOLvrRUk3eqMb3D5uL/WhfQAhyGJKt023e0vMDTIbj116UXFqk2GygLmk+Yy0hd2zYRU70Nq8g27+an9xlLIny73XP7+auG+Mi5luS85jpg6QceBMYnOV4kzKezb2eTFJLIU/At+i6eAJPHAzTJmTF16pvY8d/XEXUI2PacMQcdJAYlH+DwMaEoP5yKDYlWkeougeIO+iDJuTXIHauZ7aCSO X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5abd72d5-4998-4dd7-66fe-08da8bbd9f30 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5925.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 01:59:36.4519 (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: NybkBnC4Jp23MmHNvzGjyaJ+hL/pFsM1MJD5yDxeAHFlxvSjHip44N6hMW84/DGI X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8724 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220831_185940_589518_516CA5D8 X-CRM114-Status: GOOD ( 16.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add hdmi audio support in sdma. Signed-off-by: Joy Zou --- drivers/dma/imx-sdma.c | 38 +++++++++++++++++++++++++++++-------- include/linux/dma/imx-dma.h | 1 + 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index fbea5f62dd98..ab877ceeac3f 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -954,7 +954,10 @@ static irqreturn_t sdma_int_handler(int irq, void *dev_id) desc = sdmac->desc; if (desc) { if (sdmac->flags & IMX_DMA_SG_LOOP) { - sdma_update_channel_loop(sdmac); + if (sdmac->peripheral_type != IMX_DMATYPE_HDMI) + sdma_update_channel_loop(sdmac); + else + vchan_cyclic_callback(&desc->vd); } else { mxc_sdma_handle_channel_normal(sdmac); vchan_cookie_complete(&desc->vd); @@ -1074,6 +1077,10 @@ static int sdma_get_pc(struct sdma_channel *sdmac, per_2_emi = sdma->script_addrs->sai_2_mcu_addr; emi_2_per = sdma->script_addrs->mcu_2_sai_addr; break; + case IMX_DMATYPE_HDMI: + emi_2_per = sdma->script_addrs->hdmi_dma_addr; + sdmac->is_ram_script = true; + break; default: dev_err(sdma->dev, "Unsupported transfer type %d\n", peripheral_type); @@ -1125,11 +1132,16 @@ static int sdma_load_context(struct sdma_channel *sdmac) /* Send by context the event mask,base address for peripheral * and watermark level */ - context->gReg[0] = sdmac->event_mask[1]; - context->gReg[1] = sdmac->event_mask[0]; - context->gReg[2] = sdmac->per_addr; - context->gReg[6] = sdmac->shp_addr; - context->gReg[7] = sdmac->watermark_level; + if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) { + context->gReg[4] = sdmac->per_addr; + context->gReg[6] = sdmac->shp_addr; + } else { + context->gReg[0] = sdmac->event_mask[1]; + context->gReg[1] = sdmac->event_mask[0]; + context->gReg[2] = sdmac->per_addr; + context->gReg[6] = sdmac->shp_addr; + context->gReg[7] = sdmac->watermark_level; + } bd0->mode.command = C0_SETDM; bd0->mode.status = BD_DONE | BD_WRAP | BD_EXTD; @@ -1513,7 +1525,7 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac, desc->sdmac = sdmac; desc->num_bd = bds; - if (sdma_alloc_bd(desc)) + if (bds && sdma_alloc_bd(desc)) goto err_desc_out; /* No slave_config called in MEMCPY case, so do here */ @@ -1678,13 +1690,16 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic( { struct sdma_channel *sdmac = to_sdma_chan(chan); struct sdma_engine *sdma = sdmac->sdma; - int num_periods = buf_len / period_len; + int num_periods = 0; int channel = sdmac->channel; int i = 0, buf = 0; struct sdma_desc *desc; dev_dbg(sdma->dev, "%s channel: %d\n", __func__, channel); + if (sdmac->peripheral_type != IMX_DMATYPE_HDMI) + num_periods = buf_len / period_len; + sdma_config_write(chan, &sdmac->slave_config, direction); desc = sdma_transfer_init(sdmac, direction, num_periods); @@ -1701,6 +1716,9 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic( goto err_bd_out; } + if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) + return vchan_tx_prep(&sdmac->vc, &desc->vd, flags); + while (buf < buf_len) { struct sdma_buffer_descriptor *bd = &desc->bd[i]; int param; @@ -1761,6 +1779,10 @@ static int sdma_config_write(struct dma_chan *chan, sdmac->watermark_level |= (dmaengine_cfg->dst_maxburst << 16) & SDMA_WATERMARK_LEVEL_HWML; sdmac->word_size = dmaengine_cfg->dst_addr_width; + } else if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) { + sdmac->per_address = dmaengine_cfg->dst_addr; + sdmac->per_address2 = dmaengine_cfg->src_addr; + sdmac->watermark_level = 0; } else { sdmac->per_address = dmaengine_cfg->dst_addr; sdmac->watermark_level = dmaengine_cfg->dst_maxburst * diff --git a/include/linux/dma/imx-dma.h b/include/linux/dma/imx-dma.h index f487a4fa103a..cfec5f946e23 100644 --- a/include/linux/dma/imx-dma.h +++ b/include/linux/dma/imx-dma.h @@ -40,6 +40,7 @@ enum sdma_peripheral_type { IMX_DMATYPE_ASRC_SP, /* Shared ASRC */ IMX_DMATYPE_SAI, /* SAI */ IMX_DMATYPE_MULTI_SAI, /* MULTI FIFOs For Audio */ + IMX_DMATYPE_HDMI, /* HDMI Audio */ }; enum imx_dma_prio { From patchwork Thu Sep 1 02:04:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joy Zou X-Patchwork-Id: 12961665 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 92D4EECAAD4 for ; Thu, 1 Sep 2022 02:03:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=JzLNxKUeIfmb9WaCqLo032MKt1cYqAW1Efunzs+3nmM=; b=vrPS5VUHx67OZk ipMEb2e7xmZqgrTtyWPRV/jNw4SzxxipCE6Png635Kt1d5eW8tJ0XoAunLXTqV2kTZurU04CSwUpq Slhmzx5eBKbyAtbNn7lcAh0UGxmwhA7/WVUC5aoA94+E2tzPemTW16Nw07JNK7souTl389Dr7eT19 qd11LlKSFWmvzwNJCidL5rrczi7G2EPi3EdImQRgkzA3clmsrAbLbebHih/WtG+IOfIuzpOBJyugi Rziennvt0UjWqnDfdp2h3RU7JVegoG+VCJzm/QzFG3UI92DscFfvY615RtXivCZhxzs4elLNRiLX2 YvirYYBJOe/PIWOwPVcQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTZXQ-009629-HW; Thu, 01 Sep 2022 02:02:36 +0000 Received: from mail-am7eur03on2044.outbound.protection.outlook.com ([40.107.105.44] helo=EUR03-AM7-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTZXM-009606-Q9 for linux-arm-kernel@lists.infradead.org; Thu, 01 Sep 2022 02:02:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T7hGpJ2Sv41bhWVW5YlN/4tBjc4rLtV/Qmf1Ab95qVTK2lK8cD5KEecYnIv1QQmBhtpdMs8xB28jvf2rv5FIT7OgWBMjE1TPe9YPObYkr2KZ3Ve9CBLCHU22kSkhlrQd/g6gklRuRoghpVlAZs78qEWA3MRxQeI9GobcJpo+Cw40iI5fJQivd+xtoclv/Hdc+7oQftYDdfbyRQH2pq3llO3BNmmQm7Dfb6QT2UaopGO7aH1MyMhVcQSmmTMAMKsINhO9hPUE6aFHOnSSsDYl5EMXVuID/lIurVHsrNiqNU1YLTR6VhU/fUXOQxjAmZwz46DAp6f8Bgb1E7JrLe+Y7Q== 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=8RliWHG/hoezWalVNV+sQSmj+LjOk1JfSSi3qn0sqnM=; b=bFNYqSsMfYEAZ9y66bJpCty6D82g586Rj0gVorLYnhzC3RFmBZEIP7Ktpk2rxuA/XFtcfyfir+YTL3I2TULrwUNL+mqGk4g8p2t3qzQCLzSxih1BbAh0LLLoCOu229sZgO6sIdAzTzjR1i+2LE95GVw9x5GrWgl2u8SrlOWxPet+NU2GkriKRvvqc8eoa9HJjZZU0yr7yEPMFJKElF9bpL0RGaOxm0sg1Z5GX/0SqGlSG1LQpvs3qzBdTGSv9VdgkGlRndDNfq/H8i790LJnNggEzwxUY43/4f7fNb73FLvod7LN2SiGDS+oEEiAee7XYEb4IyIWUoeOmJEGwvylZA== 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=8RliWHG/hoezWalVNV+sQSmj+LjOk1JfSSi3qn0sqnM=; b=jb2pWMMm4n4mUVOOc8C6BEYfXlrfxNJq7ljjv0mvGfC/+2nrM4c4rT7je/wtgUbvj2uPoSdtHOXu7eO6PWsAeETGlxH+JM5r1GVobliMIAivHhdf+bnkDyzOVxO8CH/37rKrkBeZpTFKjlhwarG0el09MTm6a96vHfVBL195xdw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5925.eurprd04.prod.outlook.com (2603:10a6:20b:ab::19) by AS8PR04MB8724.eurprd04.prod.outlook.com (2603:10a6:20b:42b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.11; Thu, 1 Sep 2022 02:02:29 +0000 Received: from AM6PR04MB5925.eurprd04.prod.outlook.com ([fe80::704a:fa82:a28e:d198]) by AM6PR04MB5925.eurprd04.prod.outlook.com ([fe80::704a:fa82:a28e:d198%6]) with mapi id 15.20.5588.010; Thu, 1 Sep 2022 02:02:29 +0000 From: Joy Zou To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com Cc: linux-imx@nxp.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 3/4] ARM: dts: imx: update sdma node name format Date: Thu, 1 Sep 2022 10:04:02 +0800 Message-Id: <20220901020402.50206-1-joy.zou@nxp.com> X-Mailer: git-send-email 2.37.1 X-ClientProxiedBy: SG2PR06CA0189.apcprd06.prod.outlook.com (2603:1096:4:1::21) To AM6PR04MB5925.eurprd04.prod.outlook.com (2603:10a6:20b:ab::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 40bf43f5-7baa-4d7c-48f3-08da8bbe067e X-MS-TrafficTypeDiagnostic: AS8PR04MB8724:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VIbUOrzHt78J9UqKidPjZzddthquHYdJ72uzNL9+dRGUYoWAKrqLACPuEfjKAAr3y93OkVhfqVOkH9En8SBMBaBFVkdwWvbaspHwbZJUoMSDiLQLXOfjgKbSi3gCvsvUKG81xtT/6y1ElLIDNjEM4UNfJNVDSihYTHQkDHpi4JnSf2bjeuEiNKcbhZkW/HnsqzQEhOx6HV19QM6aGxxmiUU09qf71zsT9Rl/1hH7TxY7bHw/nCjVK05ophNlBmfvzvkvaet+EvS1rePKfE+SDeFmGAzcYVbjgs5e81P8m9KPVz/XGn2t22oKBm9bsYdU65mHO7OYMAe3B6p+smGJLiWz3K0ds0TzHyV2x6wThxmAvo+eQHh0tQQWbjkx1BSTIqmtVoBYyeM6CnoZgU4aasykldzvo+thyAFlvPLnr0b/Hwm2BpOLrB9QRqEObAt7WpOuDI++aj3vBaZxLz5lWtWtkQSSZrbNOi1Wzk29okZqMc72uO5KPcqLyaTnri8d+GNNX7mKV90KQtqOGeG856JvGz1JpEpCKWPHoao17z4F0P2QW+KFGPgWU8xUD6Mwb+/PJECuacr7bFKSvG/lOCbTafUgriEJ7uoKkXGyWxLE/H75JKLHk/4+eTO066uarG/0fScYwFl4lUjyIdcYDFCyiVoZsuJj5Osd/7/IbZ5mVBtLVuj7ZzrQ1lvLB43JL8GkKsyPD+WV1OUCnsqs9+48pjh2N35/Duwni2Mw9DS7GVG8pO7W6xKIQLBuRbeB8eGZWGQATb1nwcVhvgO2DQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5925.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(39860400002)(366004)(396003)(376002)(346002)(8936002)(4326008)(8676002)(66476007)(66556008)(66946007)(6486002)(478600001)(26005)(6512007)(2616005)(1076003)(83380400001)(186003)(6666004)(44832011)(5660300002)(86362001)(52116002)(2906002)(41300700001)(316002)(6506007)(36756003)(38100700002)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wAKnG6WX7PSp7P8OkHEKhz1f/ut6+UppTIMGVenWvUWQzxNXTO//qbGUVXQLcI/jmu7YVILKFoMCyWR/pUiPCKchVBXv/c0Nd5OCPBBh4UhoQpahtOqs0V4RwthKDJ/dC90rzlYpdKmKfDtlOxFU1dWxkKCz7FNJLy28A3zjQ2I0sJbgaJW9fvI72GbRqvE9O/YSnNErLLQypS2GciNIph/iD5OtA2zWk1/50Lq1qcTdnkFnqVVOjUtOf7ibQNhhisqR53TWp198E9tiysJa0ug6nV/AtUBuZnm+rNL5lBnJGrIScOdFx70qC6QCnn2/2wFKcX4ShB9CYnq3BLwgod324IsHADFG+FKA1GtArHJ6dF8Td2g19LRhf/gUVZUZzOX0Y6YF6xwbAN2wGqnPVunzhT8VWIRcu2v+wF82uoWwiXKy83OwacnJuOHgQ83asVllRlJk9FNrMyvl3O/jmlLSxBiTy3xEybSIDxntfi4sWe0rGdrR9hJD7XjzrQmxGdm6BJ+D6cw7XKwhgeFSTmhA/NlK48VzeJabUyoXzswSXjO2P3Aj5k3noXnyTAjvN9eDZtpxhnro6HC1SX84cy5Bnj0lat6yi638hdcPT26ZCF6vnhkF3XKqmajcT8Ul1TWK2pj8MFU+s64q/MFaV3cqRbbmaVyifd9wV28IiAxwX0K4aJNNPROPqi/6lfI5jeFJl0I34h6zIZ+PiIDNxZT9iH1Anm2gAs3rAKtcsrIeTNCLRwLmUsArJI8Lb5TYzfjF8PzlGWxlpNT8XKPe4CbC/wSJe8q0YlTCF/7gMQoU0SdJWJg3/vmVEUQT4/5Q8ZHZsE4YEdWtcuf42U2fPWx2qBF252ez0um7RluhKzdmGt1AjqH+OvolVfYM7hPcMp0zs13n5pLeOdNrPn9yMmZE7yVl/rRTw0EGLUglW0r8M1k9Fo1AY1Ipjyt2oebccmukyVCwKR41ohfcd2nWkaSKShw3wpKITjeUMmOmTiYLZ1T5jzj+JM4fhZ3Syejq7Ahp3eaJXaFfU9RgpflEt8/9aLBuDQPs9bcwaRUwX+XI5LNo7Dhf3FeMlFd1Y4jZRm/9VQ82xI3L8S81S9V+z0naXXFDYk8fC8sShc/6K1ztB3IjUqqgpChI3VLdhGBB8ixeK1IGkt/Q1+2YyQo6n51lXb7emAakEl4VF0qaA/C6dC83pJUVWkMbMOADh13/dFnl1zucJPepi7WbyTUHUdLZQW8pvm+1WwwwQjZaLa2+RTNeJUJ1pnn2KirGE6+bJ76Trb53Q0M4VRCy+N0X1UMGZkAC6pTk+Mytk+7AIrr3EDFDaLA1WKcgPhAMMDIUo8XDKc/q+2kBU4rRJtjg5PvBsswiue40y7Zb8Z0uEVLCplkHTHhIElfkVKRyarOOBqKcYnA/wZD0bpTRFf323O204LPusgSsjjdO+84Ydmte/5EIVmNj4V5GsNVG5YD4mNfCgdtDI2xUeiadvmdgUSNzzxeshptYrV8fyDQx13L5EU8Tchz81/fdj4Fycq+keyPnEpBtTjV4yKhwzjdblWeVAIHy20qlmjdy+JIaEawgwLh8Ko6c0dOrK44ebbSc X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40bf43f5-7baa-4d7c-48f3-08da8bbe067e X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5925.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 02:02:29.7051 (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: I+Dr1KiTdKUVxkfxCpCzMpL+1hI4cm1Squa4ACLa4RM45kbCPgA+Iaax1Q03/Y66 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8724 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220831_190232_869992_B494E7A6 X-CRM114-Status: GOOD ( 10.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org change the sdma node name format 'sdma' into 'dma-controller'. Signed-off-by: Joy Zou --- arch/arm/boot/dts/imx25.dtsi | 2 +- arch/arm/boot/dts/imx31.dtsi | 2 +- arch/arm/boot/dts/imx35.dtsi | 2 +- arch/arm/boot/dts/imx50.dtsi | 2 +- arch/arm/boot/dts/imx51.dtsi | 2 +- arch/arm/boot/dts/imx53.dtsi | 2 +- arch/arm/boot/dts/imx6qdl.dtsi | 2 +- arch/arm/boot/dts/imx6sl.dtsi | 2 +- arch/arm/boot/dts/imx6sx.dtsi | 2 +- arch/arm/boot/dts/imx6ul.dtsi | 2 +- arch/arm/boot/dts/imx7s.dtsi | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi index bc4de0c05511..5f90d72b840b 100644 --- a/arch/arm/boot/dts/imx25.dtsi +++ b/arch/arm/boot/dts/imx25.dtsi @@ -515,7 +515,7 @@ gpio2: gpio@53fd0000 { #interrupt-cells = <2>; }; - sdma: sdma@53fd4000 { + sdma: dma-controller@53fd4000 { compatible = "fsl,imx25-sdma"; reg = <0x53fd4000 0x4000>; clocks = <&clks 112>, <&clks 68>; diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi index 5c4938b0d5a1..95c05f17a6d5 100644 --- a/arch/arm/boot/dts/imx31.dtsi +++ b/arch/arm/boot/dts/imx31.dtsi @@ -297,7 +297,7 @@ gpio2: gpio@53fd0000 { #interrupt-cells = <2>; }; - sdma: sdma@53fd4000 { + sdma: dma-controller@53fd4000 { compatible = "fsl,imx31-sdma"; reg = <0x53fd4000 0x4000>; interrupts = <34>; diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi index 8e41c8b7bd70..d650f54c3fc6 100644 --- a/arch/arm/boot/dts/imx35.dtsi +++ b/arch/arm/boot/dts/imx35.dtsi @@ -284,7 +284,7 @@ gpio2: gpio@53fd0000 { #interrupt-cells = <2>; }; - sdma: sdma@53fd4000 { + sdma: dma-controller@53fd4000 { compatible = "fsl,imx35-sdma"; reg = <0x53fd4000 0x4000>; clocks = <&clks 9>, <&clks 65>; diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi index c0c7575fbecf..3d9a9f37f672 100644 --- a/arch/arm/boot/dts/imx50.dtsi +++ b/arch/arm/boot/dts/imx50.dtsi @@ -421,7 +421,7 @@ ecspi2: spi@63fac000 { status = "disabled"; }; - sdma: sdma@63fb0000 { + sdma: dma-controller@63fb0000 { compatible = "fsl,imx50-sdma", "fsl,imx35-sdma"; reg = <0x63fb0000 0x4000>; interrupts = <6>; diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index 592d9c23a447..853707574d2e 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi @@ -504,7 +504,7 @@ ecspi2: spi@83fac000 { status = "disabled"; }; - sdma: sdma@83fb0000 { + sdma: dma-controller@83fb0000 { compatible = "fsl,imx51-sdma", "fsl,imx35-sdma"; reg = <0x83fb0000 0x4000>; interrupts = <6>; diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index b7a6469d3472..56b3c13f4eb7 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi @@ -710,7 +710,7 @@ ecspi2: spi@63fac000 { status = "disabled"; }; - sdma: sdma@63fb0000 { + sdma: dma-controller@63fb0000 { compatible = "fsl,imx53-sdma", "fsl,imx35-sdma"; reg = <0x63fb0000 0x4000>; interrupts = <6>; diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 4f7fefc14d0a..ff1e0173b39b 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -929,7 +929,7 @@ dcic2: dcic@20e8000 { interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>; }; - sdma: sdma@20ec000 { + sdma: dma-controller@20ec000 { compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma"; reg = <0x020ec000 0x4000>; interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 06a515121dfc..61dd78467aea 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -747,7 +747,7 @@ spdc: spdc@20e8000 { interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>; }; - sdma: sdma@20ec000 { + sdma: dma-controller@20ec000 { compatible = "fsl,imx6sl-sdma", "fsl,imx6q-sdma"; reg = <0x020ec000 0x4000>; interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 4d075e2bf749..514ed4dbd6fd 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -842,7 +842,7 @@ gpr: iomuxc-gpr@20e4000 { reg = <0x020e4000 0x4000>; }; - sdma: sdma@20ec000 { + sdma: dma-controller@20ec000 { compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma"; reg = <0x020ec000 0x4000>; interrupts = ; diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi index c95efd1d8c2d..2b5996395701 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -744,7 +744,7 @@ gpt2: timer@20e8000 { status = "disabled"; }; - sdma: sdma@20ec000 { + sdma: dma-controller@20ec000 { compatible = "fsl,imx6ul-sdma", "fsl,imx6q-sdma", "fsl,imx35-sdma"; reg = <0x020ec000 0x4000>; diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 29148285f9fc..0fc9e6b8b05d 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -1224,7 +1224,7 @@ qspi: spi@30bb0000 { status = "disabled"; }; - sdma: sdma@30bd0000 { + sdma: dma-controller@30bd0000 { compatible = "fsl,imx7d-sdma", "fsl,imx35-sdma"; reg = <0x30bd0000 0x10000>; interrupts = ; From patchwork Thu Sep 1 02:08:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joy Zou X-Patchwork-Id: 12961669 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 375AEECAAD1 for ; Thu, 1 Sep 2022 02:09:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Vi2qS1/MkCx9lF19l+pIP+mAtrGlUYE7pgFbrmK4W28=; b=c3sbaIoHDbZ4wQ mMztIcaiW8oJF2c57na36A7dUhVaBc/edS0IHpQbJt+R8dHxq4rQAOZcXJQQOKOVKMJY3WQrSWL75 Zo3YREoa+whSg8TPeQEV9GjMyRCzaVBXFiEs/w2YR++AHrd5LMCi1Tx4x+llCaDzsTNxGEAyVMHJH fFCFssT0XNVWYcj3L1tqvsE8xx2iioIZ8Daz13KrvypgjAzHJXIyu20Rm1olebBRovgHzAV6KkYeL jXHxAuZXn5XBGLwMN4zJQ1jRtAnhvUxWeP0yNlgDo6X74KIkTL1w9uKkTR2/h9JboOk06mbG+Nx4I J+0ux65g9mbblI+biNnw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTZcd-0097cR-8p; Thu, 01 Sep 2022 02:07:59 +0000 Received: from mail-eopbgr70042.outbound.protection.outlook.com ([40.107.7.42] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTZcb-0097bP-31 for linux-arm-kernel@lists.infradead.org; Thu, 01 Sep 2022 02:07:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WZ/BVyOINvraHHGJ2JYACSI+ktbp1kxv90lZl6JDXRPBc6Lf4mGTzaN3C/1J2jK0gK7xO5HPJS3oTkxMtU/X9tJaAJtsXKZ3epB0GKMpFdoQvhTVIo4awuqqqXLsQ5cPvGVxJCCVmhd9LnvZk2n4Jckb8wocD1v0+6z/hzg6fAQTHI3x/p66TU0Dqq1lZ7ihndylfJxUvGUqWFbMk6EgpGl/Qcp3siFZYGsEEgSWg6vBzsVZ08jhcmDoCRZrE7ZPh6NH0AhkAheMmbsSSRplM/pWRNnn6Vjz61mGwC3/LI88tGOb3AgpeyP68YVF0BksLz7tm58j9A/dwwEHW+3T8g== 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=7SWEablSH9OldUQ826cJb97/PiZwyJuRCBFuLVqyHZ0=; b=QQea4yhobSFG5n01ozcfKcrhEgBHv32JOSARXcRup87k6GN6tXbxYL9aA44zNuU0a9Cf3co3XrOULTN7qOSPR0xkogRyiQdccuExuivuAEh+meMpVuvztWFhvPk78sTG6yFcR/U4Ja8zWu5S5ccJbxk9uZ0ICutq0bEMEaZZAjnd5NOAHPZ0piNFwybOsQvxqvaNBHXb5rO26Nr2kgv0+/uhJ+l5SB/X5ee3zOa2wB7r7zTWT5Jq/XQbZ3gkUe+e6a/VvJpE9JvLfyFSI5CqQp3gocdzRNFcUY+MxF1q1GD2Xr+w6gqQDvIgbK5njVlKgTHtg6uUVIw4uxSc4tuMcw== 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=7SWEablSH9OldUQ826cJb97/PiZwyJuRCBFuLVqyHZ0=; b=pMsKpbaX3hkal50h0Mr+6kRg+M9Pj4czPtlOzo+FWS1POjfZSD46h0H0mTlcA8p/L4+Lo5zCGs9VvIkPAfwb8kc4P4AD5h4PzAhv7OFurPvkTUveoKPOe1/7rqAY3JV0CWYd1D/uHfNqQRMIbdvL1pHLpum/O1zfaA2r99/QXZs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5925.eurprd04.prod.outlook.com (2603:10a6:20b:ab::19) by AM5PR0401MB2644.eurprd04.prod.outlook.com (2603:10a6:203:38::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Thu, 1 Sep 2022 02:07:52 +0000 Received: from AM6PR04MB5925.eurprd04.prod.outlook.com ([fe80::704a:fa82:a28e:d198]) by AM6PR04MB5925.eurprd04.prod.outlook.com ([fe80::704a:fa82:a28e:d198%6]) with mapi id 15.20.5588.010; Thu, 1 Sep 2022 02:07:50 +0000 From: Joy Zou To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de Cc: linux-imx@nxp.com, dev@lynxeye.de, martink@posteo.de, peng.fan@nxp.com, Markus.Niebel@ew.tq-group.com, qiangqing.zhang@nxp.com, david@ixit.cz, aford173@gmail.com, hongxing.zhu@nxp.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 4/4] arm64: dts: imx8mq: update sdma node name format Date: Thu, 1 Sep 2022 10:08:50 +0800 Message-Id: <20220901020851.50262-1-joy.zou@nxp.com> X-Mailer: git-send-email 2.37.1 X-ClientProxiedBy: SI2PR02CA0028.apcprd02.prod.outlook.com (2603:1096:4:195::8) To AM6PR04MB5925.eurprd04.prod.outlook.com (2603:10a6:20b:ab::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2743f0aa-0e7e-471c-9026-08da8bbec572 X-MS-TrafficTypeDiagnostic: AM5PR0401MB2644:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KCUJW47c6EgqK5Yf8S6qj2cnCMh+Iv65boXM1DrzfdT4IbG502RDoWtq3p7BijbsuHZyInIGplIRy0hYr8jXMXEEKG5U+6aFxNZwZB48fJ+g1CDKcX82BCGwauWv7sWXS1nlZJIERiFniNDSo0Whj/yNsVHC1A6F4I4r2ciR2PQ+AK+4V0ivWgTX2E/2Jul5wHoto8BnuxDt7aeJ1IeZ7i0n8fTsA1tHq1LA1eKMSJa77KTI3BZyeNo7PesL1b4U9HQwzlwO8zApVX+gGTjqS5QFPYEaWAHcyC4afiqtXrCtYFr/aIGNvVLlWUZ6co/D7OJ+SdVLaV11pZPNNC5mEBKp2aySPuDaGJ8RnkAqfFd9Vxu3Xs2djDLqUwnuAgttCuJGSfikI6OJyE1fSEkOUlOZSo78AXTEtMDXbxIO0rH1G3T5a2FFYpTI4b7F2O0qKn7rA0He9bzKRh3X/gCUyzFd6uJIjqha7/OkKcS/ZUpCvHIYU7jS782bLdXHgY3QRQdwf+oW37At1ExL1Fq+QjV5joN4cQyS+fG8SYH2lUY9GmTqKQqtU1VQxhccynk5ndtSBKYiIn2h0DzUWwBo4J32pm/nVYsCV/kuuZqJJBU14V/AXaG5O9Q8lm3hYczAm2DyISE9RQUtdT82poXwE1zIuIlVn0vLiFjD6ALMIU8DvjgWRMjVRWu/WmbvYIw2eQSCzXwTjnxheBgp6ETLmixtCngnzUtFEDQmneGtPU4nsf5VRpKBYcodh4TGm7kM3hdiAuvJXQwfTXkLi7c/mfyxMYfAKQ39AXKVOhdRm0Q= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5925.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(396003)(366004)(136003)(39860400002)(376002)(346002)(66556008)(66946007)(66476007)(6512007)(8936002)(6506007)(52116002)(26005)(86362001)(6486002)(2906002)(41300700001)(478600001)(8676002)(186003)(38100700002)(38350700002)(2616005)(4326008)(83380400001)(7416002)(36756003)(5660300002)(44832011)(316002)(1076003)(4744005)(32563001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KpxrDlx6KY8h4eF1bQUdvAwIsjNKUb567cRkypBPpAZEEDh8CFfG4TE8/LVD/svMwcqYvyPwCesVx/KXG1OLF1UJXE2KMnsSB8JzHsaxeaSSHguS3ccZHddiIpqmmaqxMnQbi+ReDCX3eqci/AK+D2Tz/AO4/nOQL4Jh+MWmRX/y2YsSaUB/DtCEBah7m6vPMrdBTwy8oXWx/uQ2p3c+59lGwUNcWJlAt3c3L8b6vBuvgU9qYgGKnsDTc3No1cPki2OKf5g8Q5We9foSBWJtRj9ssNBYcur6GAxknK2HHr9VhPdMGeBakilV5A5edV553napMEM22uzZL8ESZKCLEeUMNHt+JW8isRTBBWnwN2NjGe/eXcbs7DUzh3TuzYPLl0+XG7fZH3Dx4GP+8S8agjKw7/7Nk8BYHl3Na7phAFW1IJBeyMDem53LtpFofENo1OqSBXGTcBxik++ywgPvx1nPRg7GlpDmvGCHKhv6s5aF2hiuotMtZhaVtwy65H0IZV5WgKf4nHUCxqfETlDTWG6domCjy0IXhRgMyLxdxQF4cJ04VG9UGkJGUydUnZiWZTxINHhDEPRS9CRhaZqyGC7QIYJP+fN5rVDC72wyLw2WUafCoihNlhUrZqJ+CzkWTr9N+ojBk7VPvLE4KaR3SH703WE0V/ivRPUVIR5BDhfTLGOfYGPZXv6jg6zUfk2SnV0RGFhY8BUSkUCBo4M9nzyjRDzouMFjBcC65K6v0eI37YEiZaOWHinlhDSLHUmD+VL3e/NzpdYpkfFUUlKEI0D2ozkaygusIuW4M40cV3KP006le5cZRaWukAs5Tj8Ufxxlfj0oBtpYncXxRc/c0Op/UPjqy08NJiVTEqzDriKpDgvu/EOT7xuQqHjSHRYeuRxr6kF1GRT3FGuBH31MmVV0Xvg4DtibzTHpK85kHuw8wComlNpNmLk7C0wYHIcehpMQX8VMcqePg/tdDZ1MULkguo4XWrTtdjhlvvKpG64Wa7gzPUKLzdvZgKqLJaNIDxToE8BFJSKsFXGOVB1Vh+pM+ybDNRkrxCL9d15THYuX5i/zFozm8I3loe+WMX6YsQjZtceYqODNETcxWS3yJP/WUwB+vnhz+drCaAtrx1u/vMO57j0xcyYUrJ4YPJ6Z+Z1HhiDMWzqfG/2/PaAbOheWOIIZem2Hkbvz/maTgTCcuF76yUd8ZMRM+FhuiSNjEDjdw3Q+z2iTSe58a5K1OKWMjhNqw8Ep7J/9UmYHWGzcYD3HmNfnHoeEs+QbmjIpncqh21aQp6+vM5XeUhjly4w+T+yCPOVbuc0YWrHqBvX6e2a2OtduT+s5Vx1JHBTG8EuSv9+X3MGn2ce4+a2hDKaaAlUhHO+lk+2RH73GxEShawm8DbPleXGiTcgZYRvcXs1jBn/DxM2lc8K6bvRC6JzoCrGwMdQ5N8bo4Hjcpo4LyWhRogtbeLru6iJHfn431a7j41alXWujEBq8MlmhZvTdAUwhXlc1fM0kfMduHGfMEur6TTgTewbnpqPd15D3jAoQX2/TPqZ3sgLU2Oon+RzabLNcbp5cSfjn269mrbWjaJkgYfPrgUL/o8TmGCds X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2743f0aa-0e7e-471c-9026-08da8bbec572 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5925.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 02:07:50.2137 (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: 4P0cyZWBwA8YfTd/wjqy9KgVuPY8H8J+K8UwEdDInb1hbyyY+fEA6t6KmI5pHXXi X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0401MB2644 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220831_190757_148724_7C4C4792 X-CRM114-Status: GOOD ( 10.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org change the sdma node name format 'sdma' into 'dma-controller'. Signed-off-by: Joy Zou --- arch/arm64/boot/dts/freescale/imx8mq.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi index e9f0cdd10ab6..19eaa523564d 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi @@ -534,7 +534,7 @@ wdog3: watchdog@302a0000 { status = "disabled"; }; - sdma2: sdma@302c0000 { + sdma2: dma-controller@302c0000 { compatible = "fsl,imx8mq-sdma","fsl,imx7d-sdma"; reg = <0x302c0000 0x10000>; interrupts = ; @@ -1302,7 +1302,7 @@ qspi0: spi@30bb0000 { status = "disabled"; }; - sdma1: sdma@30bd0000 { + sdma1: dma-controller@30bd0000 { compatible = "fsl,imx8mq-sdma","fsl,imx7d-sdma"; reg = <0x30bd0000 0x10000>; interrupts = ;