From patchwork Tue Sep 6 09:42:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joy Zou X-Patchwork-Id: 12967191 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E73FFECAAA1 for ; Tue, 6 Sep 2022 09:48:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238885AbiIFJsS (ORCPT ); Tue, 6 Sep 2022 05:48:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232318AbiIFJsR (ORCPT ); Tue, 6 Sep 2022 05:48:17 -0400 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2070.outbound.protection.outlook.com [40.107.104.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B81077562; Tue, 6 Sep 2022 02:48:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mhh1G6Ql34z3gdRd2YMxvtvu41HdwHoeK7NnldY4yB0sBuqiI+7nVphGCR4rwLqAylhdY9LiT1DJ3LZrgwCtn3XuOBTV11cwP0DTRErOTtpbbXTw/vL+z3YWUuMzO4sWs2ZzsjIfoQM5uAtqVjRrKzDTn8jRfPQ1H7PMNOQ8MIhzczbF8Gg0BkAZzzWgC3V2OA0Ynjz8oaFX4DiBxcGRWLh7jrtGzP7QaEKZxqHvK3VIK+LwJJuN8stXKFy6SyCSxoDduXtLU03RATyfU+Zc93SxP7UQPcsrIqPzFNX++FSSzaUHN/QqEtBk3iAl5UkSfU5yq44cx+ytgWftW3iKCw== 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=xt6fDI5F3i8dI1X8YcnvQdhddD64JWfTToiqrA14f5Q=; b=GmSG1HWsdMQsLtxgwp7J5V3cxpzxrvhI0WV5ebdgv1Rn5uIrEsVmHcY5DjabDxdlcNtKUJNN9QLMHzLKSfStsfnblx+J8EKXhI0fLBBCAjsH4CAucTdb/5RYeZ2BN7atgJMcLeYMvOHzk5OdndOgzqQB0Tla4DbsD+RFkaPhiWKXd17RnYWWgwBIvbDjmFSEslgB/vSiFF7VYuFdt3F6RhygyDsdS1OhLuzvtpaul6+9RPKVUAGHwZNShBCRxFld+eUWS6as4RllxHAvs0j3nQJNzUTAshArCWWAYYpN8ZFG4aw52KMbtkhq7RCbbANjcvZo/4VWlqhtyzfC2b8whQ== 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=xt6fDI5F3i8dI1X8YcnvQdhddD64JWfTToiqrA14f5Q=; b=mfwOgJIpvTd+EwNcSGruQ9Q/OKlhKbQkU6Ju/H/efwc4c+WoEv8/qhiX6brYSesEBxmeF2RacEAbHa/Pqjsd4/5RSFVnT1wa/zifEEW40uY0+IKh0r5iahjQ9Pf0d8JIAgOU12VH4eAtxtQ0HVu83GENq3mzuHCA0LSJXuBpLec= 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 PR3PR04MB7305.eurprd04.prod.outlook.com (2603:10a6:102:83::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12; Tue, 6 Sep 2022 09:48:10 +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.017; Tue, 6 Sep 2022 09:48:10 +0000 From: Joy Zou To: 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 Cc: shengjiu.wang@nxp.com, martink@posteo.de, dev@lynxeye.de, alexander.stein@ew.tq-group.com, peng.fan@nxp.com, david@ixit.cz, aford173@gmail.com, hongxing.zhu@nxp.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 v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma to DT schema Date: Tue, 6 Sep 2022 17:42:53 +0800 Message-Id: <20220906094256.3787384-2-joy.zou@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220906094256.3787384-1-joy.zou@nxp.com> References: <20220906094256.3787384-1-joy.zou@nxp.com> X-ClientProxiedBy: SG2PR03CA0128.apcprd03.prod.outlook.com (2603:1096:4:91::32) 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: 58dbb4ce-1d37-4b9b-d692-08da8fece89c X-MS-TrafficTypeDiagnostic: PR3PR04MB7305:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: okwYHyOj40wbqLSwWynApPgWZiZpImPVgrfNh4A6iq8sYljixWuBfwGxLT3Qr2TXHyI015aLn377Flj0PmB8E5IY09MMSc57Rz48hLE5bLw9Qz5s5EL08fqndIveJ9knODXfsiXkJCNmNoreGkoF7YADOrt+o+/TUsBBS59jjRmFKE+D4ko+3gz1SO8XW58VbE4d0CUdxtTrgEgXGCNW9LIOP/qcsENAyRWn0njJI1eXwqxNrSJBXtaoes70FDMUKvlMm1A4kCUImvbj7g0hMer33XgAriUl8pHQtLYN6h8iScpq56Jdrl1lUXUVJyuBvb830ikkvHTYEbtEMsPreNEEZ7tFtmCT08oK2yXmA3xS/+7DcU3qerDI1YMhg+u8KQofBueCJgWIS5vYB31BucUCHS0S/AC0TIqnQ0uxt0iIl+pl/ZY+fuxDhzaP5UFX1+CSgOIGZo6DGdUcYsHj/mDxJ1YbY7zZ6DzI6ODB0zgf8GYQf6iddg2lAc78lIpZf2g1RAK9EkVZp9H1Rudtft/u/JgXKZDdkP+Pmzb37mrM06MSDyWae4yaIGGZ6vELGgpm8MPWuv5nDUCAa3yqssmgMqx9nsJFn5F2h+egcAtPXdex41BrJQluzSc54Sa+u12ZluxzV5Y+abV4Ph7pv9xgplDyufbFb5DZu//LbtJnOw5EQZ01NMjs3uwtDJeOU10Hx726so9WX34shCUgU4VAnLQoKqFOXdKSpJGSSr2ONPzLpl01cysUZHdDB5aIU4zZf0xmIQubEJaKO2Mtsk+1jw3otB4G1Lhujjh4FcycyoZETa20UXiSYzqPjDaj5jEiipLj3LHqUFpfiO6+Gw== 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)(366004)(39860400002)(376002)(136003)(346002)(396003)(7416002)(8936002)(5660300002)(44832011)(2906002)(83380400001)(38350700002)(66476007)(36756003)(8676002)(38100700002)(66946007)(4326008)(66556008)(316002)(6666004)(86362001)(2616005)(6506007)(26005)(1076003)(186003)(41300700001)(6486002)(52116002)(478600001)(966005)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M32XJIXQv0m9DoLXWikSt/+ul3FHA6O7PD5tphvnvC5lbHMLIc1CqBScXzcq1ZER2mnEuXiAW5Zq5cUCulmmLpY7UrXe8Vde0KZ/YjL8koXZCaBHOG00vlkZ5c21hJ2hGiqMrYSyWIbRswPYQSREKsBVhh1+eQ2LtS+E0uV91+GGr2KJYCTySM7yDgEogZZneKpUKd3ydEUA79CiubBTBWtL33Q2eH0xhc5+zbuhlF4EAzxJgCO00aC2+lVdpxFbBfLZ9k4LzhvL9qBDWwlTT718DR+kG6eh51iULE6UuXVEBTVi7F9p6bdik7HR9ZklmTtWy+Kg6KgzWHfhEOX2pvVFHmpK0fkH9wOM7cra5cHdVYiTWqrT4H0EqAf0oLZckC3G2z0cWcoxMOn8s+JHlS/M3m9est+ezp9Ej8L0dtgJ7fBFGwrl4oVejRKCsURhJgXhkMtx42rn4omsmDoo1jtdnPRCcXa+KSwVMvuOpKzHRpbkAptGnqpAdofzc6HH8S+NppzWHEAy0nbYx0RKYGu5lI8FdR+O+p9TIV/1sBXppfpuSgbT6Ifueoivq0vRLJtNAJjMPAtZSZ9kNjsqqo2pXFn+ZRYjakcj1TTUjgr8PsRdZZ8PSsE4L0SmHQ02CS9g9KPOPmBMU8c05ubdL2Lhqy8Pz2reD65LvA/ee86c40IEe4nRPQXCurx93Y6bo177vg6sSjTS7joL54A8WJ0GTl3s/Vp2m+hiQgmeIFgnZkTAu1ncHRNhpFk8Yget5iq60I8uXgpgonkEkz7C9Djnm1IumQT9lISDhUImNsbYTmqdHKAJj3dvkicbnDHivyxRsVRushkzGWKfGUuqn7msegmexykqJc9N+h9hCrqWSdOLyZmus1jbWsCx45gtq28Dm1Og8NOuR5lSI3lQOEd64l2QabzSsompUrcjoG4v55FVFTdiEo0bNn0cfQBg60qheARUGywI2Ca8cJceA/kJHgBn8Lnh0IIoWJrrnqbrOom3jIMr+FNI6GQxNLCS/d7dK1S4kfn6OYPQRyYtVEW57kUoPPcv59MKQNaQ9sXWaVgipXusVhSydJH61YWYh/f3vkEySbq0aQ/ilvuY48hsKyu2wKldt3skzSORmaoRfdJO8VssSbHh2ai500pT9Y1CCrwQ4+tMtmF4rBw2QBvttK+b29Q0ueFeHdo5+qAfQZWkINkeN1kjg2/0c2c9S3u2eQabQmlHstGWgVgym/i/4kWdOru6k+KcqbqKaAyhktdXSyXYni28NDJUneemsHtDzLoWqAdZVB5/o4wmglGG/S4QdE9w8OApZ4AUupM6pp0z0MgVP3S/KbSFSzp16+qqOZONYsj+VP4ODGmHbUQt/qhiK+4G9AK8mBjGEqJ09L7xaRGAZQkL9CTJgBMoslj86HaZ4jk1y2zaCJdXh2urxVTQraOx5rwgE+c/xffZiYxHPNbRJokYajueBBx/YKf7DeVUT/W0OpTEIiZ1WK5tsDfxe4skxFfJmrc8uWNCc25bSLW6x8DJG/JKHAWSLvxXH52N6W4pzZwwkSFkZqqSOBZZpTs/KyKzil2E8fg0F7uXAKOCLv1b4Pn6+yfa X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58dbb4ce-1d37-4b9b-d692-08da8fece89c X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5925.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 09:48:10.6961 (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: GGV3VaLm01ekZWqt89UfkE8G5GhG/yFIrEQupyv/Iojj8Y6b8MOjbI8XJxbB80oC X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7305 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Convert the i.MX SDMA binding to DT schema format using json-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 Reviewed-by: Rob Herring --- Changes in v6: delete tag Acked-by from commit message. Changes in v5: modify the commit message fromat. add additionalProperties, because delete the quotes in patch v4. delete unevaluatedProperties due to similar to additionalProperties. modification fsl,sdma-event-remap items and description. Changes in v4: modify the commit message. delete the quotes in patch. modify the compatible in patch. delete maxitems and add items for clock-names property. add iram property. Changes in v3: modify the commit message. modify the filename. modify the maintainer. delete the unnecessary comment. modify the compatible and run dt_binding_check and dtbs_check. add clocks and clock-names property. delete the reg description and add maxItems. delete the interrupts description and add maxItems. add ref for gpr property. modify the fsl,sdma-event-remap ref type and add items. delete consumer example. Changes in v2: convert imx sdma bindings to DT schema. --- .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 147 ++++++++++++++++++ .../devicetree/bindings/dma/fsl-imx-sdma.txt | 118 -------------- 2 files changed, 147 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..3da65d3ea4af --- /dev/null +++ b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml @@ -0,0 +1,147 @@ +# 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 + maxItems: 2 + items: + items: + - description: GPR register offset + - description: GPR register shift + - description: GPR register value + description: | + Register bits of sdma event remap, the format is . + The order 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" + +additionalProperties: 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 Tue Sep 6 09:42:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joy Zou X-Patchwork-Id: 12967192 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8098DECAAA1 for ; Tue, 6 Sep 2022 09:49:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239017AbiIFJs0 (ORCPT ); Tue, 6 Sep 2022 05:48:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232318AbiIFJsV (ORCPT ); Tue, 6 Sep 2022 05:48:21 -0400 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2074.outbound.protection.outlook.com [40.107.104.74]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4403477E9E; Tue, 6 Sep 2022 02:48:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ARlHqEkeARIERdqvipmWDyTxI1DpRCZ0RBMqu/Kx3jUD5WHrceiU58lKA+Oil8l42Vwj81k1MYuuv5JQWzHnLGK6DzVQlEMV1+XMxPtTZuZ+JgsIAqxDbiDrQF3GJ8jgzhfvL7P0nBFJKOvdlrheb6pkXm5W4EMbpy55TxwbTds6JSeIge6LU03GZMWz0W5nvJKC4MXibhGah/A4eLqy823if5/L1HVDvplhWZyn2tD5PRuKipVH32S9BJCrIuqYKq8Bh/Fxc2OY0U5grvdy323Ewxy5/7dmjwREa6O5Dc3TlMnhM352bTT5/l3RvzSHRSTelMO0BRQg9xZxNP8iYQ== 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=DzfVILUnbUj8JMx47Fs02BBLKq/zPWop5+hqVYpH5lnoSRRmX9ti4O1hUZBetpf121tTx0RneuQK5Voh8LcEKhaOx/3VKObjD2fwPGVyrK3FoMs+BzC/v2UIsQqKV5PqW6RXkk5+JUnHk5jRdzGRoKX21+y5l6ANB01OJVeO+dKO5rVMnfKIua3epgVdKFG153naQEy20715TXTa6bslBcFFsyTL7/efnZHCGugxavUqLO/CqwFcLEKk0X+tbb+YhK7s2gZtuJsxD10B5iZjUyH3VkQ4IsKoEaHMYofyPwfPllGGYFOjcqbuF5VYyq+J2V/YfLfK1y5OyDNCYH768w== 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=PznoXhoGi41YHIcpoe1iKTvjiNm3zn1B2uwCn+/CuS5DFzapZKaXBCadn/y45FJR/2mLsSbfyLc2Uzqdwc5kwqzHNb3uYWh0zK9lQtTaUq2s70DzXOMiZfH23vEZWhN6LfR3kBm0d+o1769ljiPWvsF/eElF9zfYpuTQioffnXE= 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 PR3PR04MB7305.eurprd04.prod.outlook.com (2603:10a6:102:83::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12; Tue, 6 Sep 2022 09:48:18 +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.017; Tue, 6 Sep 2022 09:48:17 +0000 From: Joy Zou To: 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 Cc: shengjiu.wang@nxp.com, martink@posteo.de, dev@lynxeye.de, alexander.stein@ew.tq-group.com, peng.fan@nxp.com, david@ixit.cz, aford173@gmail.com, hongxing.zhu@nxp.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 v6 2/4] dmaengine: imx-sdma: support hdmi audio Date: Tue, 6 Sep 2022 17:42:54 +0800 Message-Id: <20220906094256.3787384-3-joy.zou@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220906094256.3787384-1-joy.zou@nxp.com> References: <20220906094256.3787384-1-joy.zou@nxp.com> X-ClientProxiedBy: SG2PR03CA0128.apcprd03.prod.outlook.com (2603:1096:4:91::32) 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: d8ee2195-86c8-4387-0679-08da8fececef X-MS-TrafficTypeDiagnostic: PR3PR04MB7305:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zx3ZgPyF6+8Bx0SEXx5kGx0mibsU8bAGP5UoZlVIWOMgVBph+4nOzU/bVR1/GoY7TdzCSw6P5vm5+Up94qoi7oiwuNppd5fe6Egj0p2mTdHKWfa/CudDwfE1cy+tedTCeTwntnxiWalnnaKRZ9yp9gcuaM3t90ZGMRIxtdD7AOduB3kR8v9aDK+25GIQe2LtLW0yzUSPp8/ztvNwgfpYuI245+5bL1K/4cp6BdFu1pGIW9Y7Ok1HGiRTUv6p02elR6M7njvujdvcvotjgfkD0StQ3S3ggB4Z3lvDrN1s8FXEHTT4ZYD134eFEYDHgrJTngtRWg/Bu6krffriyvkAZmkkCh8s8HJvQ/pBBxKy4mi2hQWk6YkTE+Dqt9oAphfDoa6MVopXdhXG7x3bu0pPf1zCFCdbB8Y0G91F4DWG6GRwSALvodTGDbokuH0MFfPjKwmJqmY6DCPbHbZ8YnoRKncV4ibaZtKkrfbz/sER26x5BkEvrU6Q60OFhqA6xQqQb4JMP07izDDmb4G2gBOz/Mqvneg0T2ecUKdS83lNapDuX1YIYkBAeVjfiAumPXZsItD/+e1QfSgV9u80Zckmb/vIn9xFDBijtfHkRAjaK1ceTXkOPvUG4L+vWHWfTAmW3fkzUgP7NcFMHoVdc0SdusOiS69iISZPp+3Cwz86Fq2yhvgJzA5HsbNAEMRn+ohiP4CUghzfEzK4sIfs7jiiGCI7eqqWuXKIrtd+USoZaaqlsnyOu6FntSS5F0Y7kR40HvARQZOfjkV5b1z1akl6PA== 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)(366004)(39860400002)(376002)(136003)(346002)(396003)(7416002)(8936002)(5660300002)(44832011)(2906002)(83380400001)(38350700002)(66476007)(36756003)(8676002)(38100700002)(66946007)(4326008)(66556008)(316002)(6666004)(86362001)(2616005)(6506007)(26005)(1076003)(186003)(41300700001)(6486002)(52116002)(478600001)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ch5fYqUJTfq3Jdl2a5LjDYse71X8m/vrp87GyBPnQiF1ZC9deLWV4OETl9ESqQAFAw8SUr4C+0zWG725moBEtxxdIvfCGWawNz8Y0RBWfirwxL+RGAu6lJeylRsG6NDBUJ8n8WaQdQtX727jQtQ8J1BeSCoBOUk7XZWaRgOBvhIhCS5CSI6nOj+gqNlF6dVszkL7lSdzHVegKoSZhF7PlfqNSJ6uIGjHL+dL8T4DmdvQGj6l6jao/5hCNwxob8cDYCAsXS1uCaCDQipTAgaBm5zve7FbI3sl6Vwkwt8t2Atu+EjGVCWuRiyAiBBsdx5VGxoKck+wJub+P08Y0fWmICvB0DWPHekajkHoDqwenxKkoK06I/wj+ds5nFU+yIzfXQPjTegrdnglW1s/lF199kw4Ve/XW2pcRbfMxWQJmQPka8A8Q0pRYOyBbphv4wKIoN4Zs+tD9B6vdf7bno0pv5BE+3HTC/muVMemiXzrCmgICXSvjzfK6ejtsuW9RP/T8aVUaN9a3ts39fdteTMirz+Tha9whgiJ/XSDYDuO7vzkENNqxDs0nR5PLL1RHBBqMEsEzKpvFoXOmCpp+1KDbcJJ2tpywcE1inYSTV/RLuhBVkm//ZV/0dIT+61Gx4OOm+WLqyb/r9Efsf5AYvn64OgJ82kEF05bH/ccvXY0gIJtkoiO6BhXm5ZsOGsqtdjyz+YaW0zXPnHMYlgpSz/kxVAyIjfdYNwIbOUpefuzD0oLSLecBwTrOuhrjvnxkaZ8mhZOFffYic/nzcSs1p/UbntpKfEcE/Snt1h5kyWvc1Jjp6o6sxAd+hzcpYdX9UAY/KQEugJKUeJVcVa43KBI1O3rV1yAUj/uOsTxW7b0PFSGq18eT0q6rY58iV1SbZvlk1RVQ1hb2wEL3ouxbvIW6oP/Gc2OEbUvYdPO6+0OScMyFF6wHCfEI6OyQk2gKzuPBbYM+uVZGLI0Vqex+jXGytXzrpVcYbTmQrIqdtwg96S5XuccNvddqGozLrNlCYaBATCMwQhlKKtDng5zdjUNBC+cmqQVdivDsElU0isKSZpiEJfj6rvKoq6jf0xXpqPuP70dql8zPXDAahgQhixGTQQK4qHxpJCwnvaI3Z/3YtJ6r+DpTwAJYKAVQZr1m+6LZSBJfmaLBkCsqQrcNPEzsHKcWXvswXv611BxchuiywdP2X/D4Bu4DDUTG220kiExelywQfqDvbA8jC5kPm77sc6d2BO6G0s1QC0v2O7C9Cm4zaKlnAn8SonR10LWrepgSvmJ7RaYCWaaevBLxnY/DwhPguH1QtzO/VyULTUpPdzkT9lvAgzfeVCTVdQUcWP0YBKYmkfLKZkT60sewtgDd40otKObQQszWtkXTypw69EhoIHuHmjJNoE4BI18vCB1YLtn1bTaUG/MvyBV5uHNiACSrc9lPC86bHYP03IqvXB7BcR24vrvYolpgWefXbiXQ9YF4BekdbWxk7Oz5CVsJS49/970r611dFl36mDnspnZyNomgdDEVCOIWdmBSPlZPkLRfb0ZguHl9noif0Up+fyy7h321GKFzaeVp6tyKvzfRyDaRokQrApFMy2rWrxW X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8ee2195-86c8-4387-0679-08da8fececef X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5925.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 09:48:17.8050 (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: LcjfyFJz0EYyW/fShKgpsfOzQkn5WrPHnM9ipaTOnMwHDDjy2xW4gH9niWChQROq X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7305 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.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 Tue Sep 6 09:42:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joy Zou X-Patchwork-Id: 12967193 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62EF9ECAAA1 for ; Tue, 6 Sep 2022 09:49:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232318AbiIFJtB (ORCPT ); Tue, 6 Sep 2022 05:49:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239183AbiIFJsc (ORCPT ); Tue, 6 Sep 2022 05:48:32 -0400 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20613.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1a::613]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D06378224; Tue, 6 Sep 2022 02:48:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PvP33Y+AbPSxSvWjoMEZxn2uZYgCuquYntMball1sdK+GTxi+scOfCzOX7wMhSepZTpM1kInzs4v+RKZjJVk42lY4h3uH0MwkrHhUNxA6YrgLVNEnzbBHWordvqlnXcn3DMtJaF/wwKRfGM36mOVjVxYOYJ4nhUm9i+oSnJQo3TeETOVEQwvVlVECZtVvbBmrDPcLkA80Rm397wmJMvVkjki34zpHzdJ6aGi7Z1iCLhPG1zAaRhSg3ZTLMeLSLdNLv19yft/vgKvBr4DKJmNAHOev0It3iA5wgd0VkeZHHG+0m9GJSRc44g03Awr5TEpH7optnwqwJRyi3Lrt9bWQA== 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=JdSKn+zJ1W9xl3vGEDw7eN9hvzZQ5k0a2hV5kaj4deY=; b=nMu10tvzcPuOtc/Z5Nwj4nIPSAVaRmD/7hZ/NoA36TPJd6x3vD4/m1M9Q0qcE216JyzQR522VrgoMhZ3O2uSv9GDgzKB1b2f3i977Pb1CpeVW1D/9AxLvLrK1cOj+urnC9FZW9DQJWwntt73ObVgdYaiWWrbYzULQq7qcjYI6Ao704gB76YP9qc8Z/R3GgxCJ5xbfcflnlyT7iEpC0r0LYejkPSa3OZ7XHZRTElMny0IaQPUDnz3fYbGLNwqejVfki+iLP/JZtGfCdo6n62WlSSCRF3b24jWAfp0CXO5nU2gN/q62VYmg9fznaxjxQjbj5sNTSkNR6caesGhVbzqTA== 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=JdSKn+zJ1W9xl3vGEDw7eN9hvzZQ5k0a2hV5kaj4deY=; b=p26YzYczT0l0zcmaj7NQ9aQLjxHfev+jmq/lbdi+KJoeQp8fLPan1xyecdifidQpz2sDaX/0wtyXsLT1t48sbcWSjQQUkkpEDQwUV7j1yoaKO7guzrN1fjy/4xKQtb8rrCub5JTQ5bO/BvyBrQLVRZyIFKkYws+Osmn/XKoZZ5k= 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 PR3PR04MB7305.eurprd04.prod.outlook.com (2603:10a6:102:83::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12; Tue, 6 Sep 2022 09:48:25 +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.017; Tue, 6 Sep 2022 09:48:25 +0000 From: Joy Zou To: 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 Cc: shengjiu.wang@nxp.com, martink@posteo.de, dev@lynxeye.de, alexander.stein@ew.tq-group.com, peng.fan@nxp.com, david@ixit.cz, aford173@gmail.com, hongxing.zhu@nxp.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 v6 3/4] ARM: dts: imx: update sdma node name format Date: Tue, 6 Sep 2022 17:42:55 +0800 Message-Id: <20220906094256.3787384-4-joy.zou@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220906094256.3787384-1-joy.zou@nxp.com> References: <20220906094256.3787384-1-joy.zou@nxp.com> X-ClientProxiedBy: SG2PR03CA0128.apcprd03.prod.outlook.com (2603:1096:4:91::32) 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: e553886a-5eef-45bf-c19c-08da8fecf12b X-MS-TrafficTypeDiagnostic: PR3PR04MB7305:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AaRobycWyOCnxZtrcKmGJ9dlsQOAmiXpK47I6rqZq2I9HJ5G3otkSsCHUOxoEod15za0jZc4KX6JbXZpNvjk1Rh+zGGEGyNbZvr6/H15So2ZulF82/2byad+vGPSWHIl2RFrFqpBz3X0pN2KL6NYfo+YrOr+STJODnkXKkMa/PB5rGMdURdTBIgH1qZTQDev02azhoGtZaP+esV9QEbbwzJqoPdUJ8RNhK3t8VrFO+cAFw/4U4pXkcI9IXzYN03yaJxJkw6pf8hUhn7bq4wAjyDIpVQNxnvEpk7rh0m1h93nAMxYXyAV6fsetUWen0ZJ/09x+iJ6PQnqo6T2hooVQB8Xj2fQnrip1L2Hm9zFzm4XfXiO6MkuN76nk/BoAZfglBohSRmCM1UvPBIvTRkaBeQVfz8z2WNsqC/BEeCbrNYASIVR6nzGaOru/Y7zwMlL/KnY4kqfb4PF9OYrbpnGbCT0pWc75meze1ezuRJvRbtzx+TjvZW0lU1UD1cKwzOu+dxcE1QnH6+Y4qi30853TRKvnPlu56K/r2RAx2Rp+ZMjxml5urYxZ/dGmLzak3YDNUiEyfTymY30holU/0q6K560n/jroLDDf9h8iqGhj3Miu1yLY883QAIvP2mE85eVZQGY99TByqgtanbGf3Fap3GZ5ZCDXfs+tKjctuEsh5gfLEiPamkUWlQwd23mV6jRIeN5zPNXjkSzaOYHef4wxd0hzPb03CPDaiGRLQtfKzRbiVp5bncBpXKwjU6H4mZa 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)(366004)(39860400002)(376002)(136003)(346002)(396003)(7416002)(8936002)(5660300002)(44832011)(15650500001)(2906002)(83380400001)(38350700002)(66476007)(36756003)(8676002)(38100700002)(66946007)(4326008)(66556008)(316002)(6666004)(86362001)(2616005)(6506007)(26005)(1076003)(186003)(41300700001)(6486002)(52116002)(478600001)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Jqt06sfX7thCrQplFpbXZvIc3lJW6Hgfiqq9PnUMViS7n4fFeUplsGTXbjM+dzUagBjFMSNg+YOCGE5MFBjdSrmZAsQp5Fo4QJVG/Po2fYxBCqSMMwSdr/yi0syda5e1PRgl0dzkmmXSxoWYGASZDt7EAU1a7lEMidjkT/cDITOXU7PyBU862P/97yxx8q5iXrvwRVpyyZcmCSpGubBOAUP+lgAv+sWMBgw4zlKCi26+QLEsZ1jdS2CyATK0/2Hfo09+s4xvdTlhhsRwy+DqmPA2RAm9Xv/ROYVR5j4+Kgr5T2ux9afMentnNC/0ixZRcSe5EQXOp/B4CLcEqMVfy59QoyF2SKtFAkuekKEEs9xKQ/LO0F/RWgu6jHj3MiT7NX3vaJhADkQP5vA8xOte2sdG3bIhFuboWkylDl59vY25hIN2Z5bDN/xcWI2rlZ61TX4RxEqjxIulR8R4i9KbGbGp5WJXMxSFOdua/tSF/ERAsK2vss1XX4+YHnaZP5sGtY6th5Kzn/sxSXPV85976ERyyyYKvamaRwYJ6/lrb7XLN99L80pD57iGEgMD500BGO4VGyRCCSmaPx9NLlMKlUzeDSIwMo5JCg4rxCEFEbeTwu/eADouyb6MctvuLbNsQz+yNHafUhEhZveeBB8jmOO4+TWRl0hfuH7LqkPv0ze5NLc0QX4cygZ2W9MOUO+UbacXG7ykFFh9dSo+yR02D75rzge+GrCJa5of9/HX87tp62STVIeE3rwzthPMooEHodboFf0B5dg/K+UbnTiQh3mt1JmFVHrwc4Ze+8T1kzp/wFfGUVse4RMgpSBhwKyfQJ8OGrmhhrsCFkW3pVRx8JWh2E1QModcR4i1b6zZVzHuuV1bP/eeoOzaWmvNlEvWnTRUMRyziJ0E3zr4AladN5/a/Y+CHCb1a1zTeM4jqq930obX4Za3B8CC+HnM2HFe2ghC0NNUaAhvvTa4IxRY/L8XE8u5y0OLr1oI+To+4IGbm+xXGm+RBqmkS/G246NksR/lS8+PJ+xXHFfpetrGttrWIc1uOf56K0414v7HMzSSqlSb6ksvZ7FKBJK3CRKhcFP2LCp4GdsRBhWL9LZobWZJIbC50KvzMNJ+sbw/0gmIpA1j8199L6018CNHIcAdDM+pg9Tp0z7jNUmyM481WrZtTQk4WvcJisSnhP+lAM5xiPg9vSJwMmnmE+CuuRTqVw+p5WNlYPmhwH2m9cbqaBYczEZLPlM8jfXE9yuUjH0+CzDe1AtVer6w/xaidVzoXqsfZJUh9jghKf/+AiBIx1j3wXq1TcNgLpJqFF/cp2rrzPKVHYC2R28A1/+IVI63gS9BxjXSfsnH0w/38m2HSeLYEAni6e0E94sYOK0IF86G3qzLk8crOeuK9Cfb4fOpEemUKbzYE+aLLJoxpfdJ1BMx1LwpaSA8yYNjWVsA7dc+29tHvOtSDwxWdC4rjjIPLlOiS1rVmOQAqyhNgCYodBJwJzBZzE9QRRh8pSCRU4ZbKtU5GQ4mDOLph+0rDuuUw4nW/t3w4iST/1Dvb874bglUqlxxcHwTGASmTraaP3EDAmfmiOsAoDYbw7XAfEoT X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e553886a-5eef-45bf-c19c-08da8fecf12b X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5925.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 09:48:24.8983 (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: xgU5KxRFabFgLxroybMYF5K7hCtGhKD4oTnwzzLhAngfVKQOinKNhyEd962o22Sw X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7305 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Node names should be generic, so change the sdma node name format 'sdma' into 'dma-controller'. Signed-off-by: Joy Zou --- Changes in v6: delete tag Acked-by from commit message. Changes in v5: modify the commit message. --- 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 Tue Sep 6 09:42:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joy Zou X-Patchwork-Id: 12967194 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C839C54EE9 for ; Tue, 6 Sep 2022 09:49:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239126AbiIFJtC (ORCPT ); Tue, 6 Sep 2022 05:49:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239286AbiIFJsf (ORCPT ); Tue, 6 Sep 2022 05:48:35 -0400 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2059.outbound.protection.outlook.com [40.107.104.59]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECF8A77578; Tue, 6 Sep 2022 02:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QCdDvR8eor0EImvEEh+j7XuilDkipBiqHuQUZ+KTENDeiW0eW+G31AANGfHrqp1PvZ9A8h5nmQMc3DPc7LfmgiPqma8ilPPfiiP+F7jzqZibgqQffZfdAsVUkJ5TRceuSfA8rvfUrL8B9elMOZbNaI9FvdJUBZKanNQWKGipMqc2S2iYhhBXp6AX0DnhKYEy4vky/tVnTtAMue+rb94SANuTERQ4+fw1NrDUtdjN3o9ISrtJ1sVVA5I3gACNwNXUBdjflh7zQUmgvql99WPh092ui0Zs6PEFOCwoirppQ4Kqs+qnyrBSIZgv2XnMnR9qiDHzPfkjmFzF+vNzLPiIIA== 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=r0FmPn9bKy+WC5vi1B5s348FJ6sWh/6fPot6HI30w/c=; b=RFwF5NqkoBlcgKKzwDjGWNtoYV/YMVVMV5htUwBAy4yHBwqc7f5CKRpFmshjC+gLYRskHsKuJTbBbeek9ZGP/Nj2sym3I8TLzmlzJaq548kvslmKEG9ie8Fwfd0sZeUx1iG+mq2Cf/bU/hpiifJcl9pBlmszRYNfu4HhXd9EV5fxWwkr40Moj3FC459sB2Nzqe3wi2CnBcP/OOcE7oYswd0S/UX60U02Sx9WVaeW05MSFM5/5tFF7GjuRQZUBMaf98+NDFMeyNea4VGTkRjqBEdpxTVpV8LHCOCz6dGhq3DCqZ31x+cz/tCTFHpzaDZiTsrVr1pYrA6MKy/GHrP/Hg== 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=r0FmPn9bKy+WC5vi1B5s348FJ6sWh/6fPot6HI30w/c=; b=LtHEbcSYx1k0VnFfK6FqB+JmGem568wNUEbF0sWF31HH+/zmesVC+EQ3OUF2EO/B/VPGuJGW3weHhy/4PICZ3qc02ucCBFb6XRdx6RtqFAahhf7BV5xRSF+cOT8s3E7M58LjGbW5ay6/pGRSrcRHGPjOvGeK6oKPxewhG52dF8E= 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 PR3PR04MB7305.eurprd04.prod.outlook.com (2603:10a6:102:83::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12; Tue, 6 Sep 2022 09:48:32 +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.017; Tue, 6 Sep 2022 09:48:32 +0000 From: Joy Zou To: 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 Cc: shengjiu.wang@nxp.com, martink@posteo.de, dev@lynxeye.de, alexander.stein@ew.tq-group.com, peng.fan@nxp.com, david@ixit.cz, aford173@gmail.com, hongxing.zhu@nxp.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 v6 4/4] arm64: dts: imx8mq: update sdma node name format Date: Tue, 6 Sep 2022 17:42:56 +0800 Message-Id: <20220906094256.3787384-5-joy.zou@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220906094256.3787384-1-joy.zou@nxp.com> References: <20220906094256.3787384-1-joy.zou@nxp.com> X-ClientProxiedBy: SG2PR03CA0128.apcprd03.prod.outlook.com (2603:1096:4:91::32) 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: 25fc980b-07c1-44c4-665d-08da8fecf593 X-MS-TrafficTypeDiagnostic: PR3PR04MB7305:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /I/L2Bz+Sume6KRFMJhW6xdzgqvompCgjdESf9/kacrmxIoWOoMwOzKgCm4do0ChYzEbUAtR3KTDr5pFVABldsFGvzaOql1hIdRW7NS6cq4gLeyv8PvHdNgTSAPbMVSuvePQkR1JwhLWkyHbP764bQ+bErydAfl9OCvWczeKoSy4J5ureVgxyAdNa8oNdKQXLvIadH0ZyDI8AO1tNRSucqTNcCLCdYmTrVIfXl9ftx7iDSHD6SlHAsbEfU1CaAjqtkEc/EAS12SczApdbWBQD80SnBwMIq6wmHAcmg/thV0qiesv9QtCeAn89lN9PzOgg1w9VHFwsVhQ7xvYYtxBeLsAv5ld59aMnGwoOEIZ2CrrVMm00sTPCbhOzhk7RUzu5kMo/FeXMlCg4RGwKePrD1mHLI6Gu8fo2UcixGhw6aEEilf6yeUeQIbKTP7S9nPaaoOtQ2bFGQ1636azIi8kUWQbvkviAl/W5sKtw7DTyX4JVne6sDOEg9qJcqgLoT24Wv4vYtutWys/IPnQkSQe+SlA6s2efR3y5Y/BQESYxbjduK0mDHWfQARdOD1MifHAyspxCf4I7fnSP7PpEhxcfo/DbCHSS8B4WAmBa0fVg2J0GCfewnHDYhFJ96MTH9UeHW4EThe54tedWPTFj0sAQTQb1/7tL5Q5tCVLFwEwrWQXNphOfJgWYedYKB0SxFztcSTSWXVoxoeOVsUZrLfV8cdE3Y9rkajWydk5uyum7cL3lyFn80/4lCACs9f55wyZF1wtohUKAG+/6NBrqXJw2KlCo3cfcbm7yxdJNirUjzo= 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)(366004)(39860400002)(376002)(136003)(346002)(396003)(7416002)(8936002)(5660300002)(44832011)(15650500001)(2906002)(83380400001)(38350700002)(66476007)(36756003)(8676002)(38100700002)(66946007)(4326008)(66556008)(316002)(6666004)(86362001)(2616005)(6506007)(26005)(1076003)(186003)(41300700001)(6486002)(52116002)(478600001)(6512007)(32563001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BNmrjsCiZBxTYu45O0Q4pA2MAxSv56ZwyeoVUQVQS3xZKn0D4rwZp9P5EzRjhp0FpjgLDreVbXS7bIe7VvWq14BtviKRa12I6bDa9uhUq99P6MnQSFWd3Rs6o1H74H2cD9zF501uQl1T3DHKQoBdCvUuk3k/q1ks17I0N6b3tKqxJrz836y6lpPEjcZKFdURjELTJdnZDEXnA/Ro0+NVP9do03QSAUjP2mgwTY2VCE8rhUeiNKNIJj7F2mZlnnU4EWCyjyUVJNuVEzM3i1emNXJv/xdjRSo3tdZS6Jh/zfNglcnnimhV/lvcKZQU5z9qruxNk1RuaPlBPL/VhAQWYYolTeUgktEFSxA41dsGhsdnEMaxV45hEHir8qhSfhAf8tCA8UbqvOQF50mm0iFn6Hf+Lwe4Dx0RWMEbb/yJ2heUWO5DRVgsxRBUuL0XA+hH7DKv5C9zt+N6mRgl5siBB/lKNUQs9vGGUYiqcBmw7J2Z0VXs/eioVl953yvezf1NVlSgPjR/s4WIpMa4HyifqXFnxIMHKMAiPmcDPAIszggWGwpZX4AfilmxTORkbsh5zNkMrhV3Cn7mtCHQX0q6DkxWVE51aBH+CnsnfR5Ba9pPR5GmfUSSXvij1DIG/FsabK8lhlVovapkVeNt2/4JkrRAnyVLqZPotmsc1g1XLlYdTtSno09zCRFYZPd2a1Bn9KQtuvWAaSTNvUMDRgQjKNj1d4h7aPtmIACV7wCR0zwNkzkilp5tSSYy1uZN0Mtdt20eKtXPnABl+/AMygnZvfPH4er7jimh0A6DWiRogtcbty4zC0UKoO8JM8TkoaG9m+wjJtYxxHJ05ZrBOKND7KRQ0A0QG2TXq9ltRRNt3vcYAQL1EB/CTyi9PphNWHtGffAxP7dbkY0+gKUzHhVmzzjzRhB3jEmWW2dveeWuSHXjeEgsQpTI/w0g7cxN31DdVZLS9gzuo4wN2hWvQPL6nugObt8Ly+WthMhLCDmpmyN7zHuFy9V4xcueLiTryeKnC1c5z002lCjoB8VQZAxFu2eqLXKzZFHkeEetsBaij3xMzQxX3KUyahM6hdjEYmdeQ31mFeD+mHFsGTENHjwunkSqq77xXCUukPxzBbn3/JFisyasjqX7hGD45Qk9ocd9QbdYBzgyOXKiVXOF9Tv3OdSgqd6veETZlIAOBNX2N6A7Q080YkOYuCEk9EnQRlvMWUaNvHbuQhpmAROdytgVSKiEndG2ZKzl48UPdiqsMHxTu5uUnjxs21ZRDxf0mWhjlsWfegl5A2q1wE5twDJ5+yHOQEPkw5e9bTlA3MIbu1avX4Xdl1XnwyjyrmzYpAZWA6QDqsDWEj35Cn8dQy4AogwKw/Nr+zjqN6P97hWwncejYyDyKHCPAUz54jCLtYj5bXPNK16otT0eUGee5eIfJ0zljE6OJeqET3e+3m6Xx87xvKUTZY50EWMy6cmsAYjalsUck2tckNu/6aFvLxRAXqaPa1YjQkRrwU4hu16a5GVolQHtRYq+O4546uvbDoN4/BkBfkhIcIPhAs/OT2hQUNPdFppsf/0ACsV332BvFYYzzvOrBh1oele4EXcx2umn X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25fc980b-07c1-44c4-665d-08da8fecf593 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5925.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 09:48:32.6946 (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: LFWyilPi9CJfdMZASUmh2zT5Okl+281GQdFzH8tjWAFzRO/Ouogq2iB839hK5vAk X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7305 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Node names should be generic, so change the sdma node name format 'sdma' into 'dma-controller'. Signed-off-by: Joy Zou --- Changes in v5: modify the commit message. --- 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 = ;