From patchwork Sun Mar 27 18:08:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bakker X-Patchwork-Id: 12792889 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 9F6F9C433EF for ; Sun, 27 Mar 2022 18:09:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236284AbiC0SLD (ORCPT ); Sun, 27 Mar 2022 14:11:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236276AbiC0SLC (ORCPT ); Sun, 27 Mar 2022 14:11:02 -0400 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07olkn2089.outbound.protection.outlook.com [40.92.15.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEB243467A; Sun, 27 Mar 2022 11:09:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hWr5SfyPpvFlmZOqavkIbhDdw8ydA9tNXXMsLH6YmyawI9NK5TfHTKznBD4j0/EDJvL+pIFj2lLgjecngRAGMvaT2B1nldTeaMzjIrkvUyjLsZpEzkCK0pAXKV+kzNsRtHGvNWoHMhUoXJ7G/5J9ALswbcICr5O5Ye4IkmVyox/WWLVxALM66e9qXUFA09WZiMaAiEZJt8lfNajaIgoFmqYiaoocQce/4cOM4xJ0Pp8BY90P+ekgP8xK02qacj1LZOJgitGbyftEJ4IPH2hBxjZnLy6acp/T1W79KmXKrKywckuhQP3ruL3HzDoYueToT/KSx/dGsAvYEj7UQ4UmfQ== 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=+0eqBNZdW2QwZRlBfTX4mH3GI3a6AWc7lIT/oA6JgRM=; b=Iqxr4ZAfYFFdWhncGMk3aWy2K0NEZuJxqpu2HocgYS7F+X0o7nJM4bCPTFHH0tnm9KL/Lw3WSVSKFifHHMI+sXWtcmUuInDwJwGsMzOEDuuP8nQGK6yM4cB3yUfu9q8Ovi7/seHQy28FNwvF7jrhQRDmz2ug+o/CCNsgciZ1KxoZztZxWLwaGQ81WicgENV1nOtUzYz2UAs9VoZJC9qzUHLWFKGs7KGmaW1adw7yzVVrQd75v7RbPcWcx7ZFBXzY04jQc+n70mJkeO114QuOtnm2vx4LQDAQXmTr17+ztz2iwIB9akajXZdAUq93vOfeMtLy6EK9JXCzdxqayZfzAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from CY4PR04MB0567.namprd04.prod.outlook.com (2603:10b6:903:b1::20) by BN8PR04MB5778.namprd04.prod.outlook.com (2603:10b6:408:a3::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.16; Sun, 27 Mar 2022 18:09:22 +0000 Received: from CY4PR04MB0567.namprd04.prod.outlook.com ([fe80::451b:e5ed:c1a3:4070]) by CY4PR04MB0567.namprd04.prod.outlook.com ([fe80::451b:e5ed:c1a3:4070%5]) with mapi id 15.20.5102.022; Sun, 27 Mar 2022 18:09:22 +0000 From: Jonathan Bakker To: krzk@kernel.org, alim.akhtar@samsung.com Cc: robh+dt@kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Bakker Subject: [PATCH v2 5/5] ARM: dts: s5pv210: align DMA channels with dtschema Date: Sun, 27 Mar 2022 11:08:54 -0700 Message-ID: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: X-TMN: [QS70HMVKJ4/wXVSwn4WNcVUvied2AEaiOPeaV+ScTomIR+qa7Dtkv7Vgs3tXsu70] X-ClientProxiedBy: BYAPR07CA0031.namprd07.prod.outlook.com (2603:10b6:a02:bc::44) To CY4PR04MB0567.namprd04.prod.outlook.com (2603:10b6:903:b1::20) X-Microsoft-Original-Message-ID: <20220327180854.4857-6-xc-racer2@live.ca> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a568fe9-923e-4dd5-ddf5-08da101ceb26 X-MS-TrafficTypeDiagnostic: BN8PR04MB5778:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8Od960jT5uYPrlay4+oTU42dy3+s4y13140/3WJhRlZGN3Zs/Ub19cpwJoVSBXQmZ8D4afWg9Ym0k0i+sh2jsVJNQyGDGV4x3pM/W9txyQBcWy3IR4buIiQ46dLhxAz5q+513HT3Q2aYjBpNRTdTV9m4oyQ0kuwuiYybinRXSB9KKuMW4CH9kaxlWVvZmf7iC+sdwOQHUhJC+t7CRs5zy8X5CJibE6yDonhuuhWtl73LSJ5QAudwGknrlYTrAZ/SUv5gHIOIljyl/lNdDzuPI8QALpG8JuAVxYwtgpOM+2gN2+Q2bUlBw7dr9kZ40TVUrcga8z35PeLTp0KOjg1WCaief4Cxa5Wu/8bbeYWApWNuYwfKMhyNIdTUqh3qA/fegM6Rt6HJx8BQnH9RLfQOetFRy113sQBz6QfrpF6ykwx2m29YB6I324qasdMdcsg9L/gQ1CRsHgVAh8eMxBYF5XpGdAouks0C7bDA0ZauPuenvT273d6uXe/qyajkS1ariDrDKqMINL9s7hnNz2rESo0OS8haCp5OwF1+CH41Wbwqqpzu6AZxSGkPW416RZtVLdThET5oMz75vMmOk/ow+g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vfcuSdkTyZEWahGv15OAxxFsGMpS6EOwpbwm3sDIpikezNnQvoiwUTxUugxtIufkP5l4JVTZOEZOr5b31IyUc83pcN/5GNTnSFpTxllMC7tasJ9KQTOQVsQOMjQs4ZqU1HQXblPQr8fZX+Xs0E3vtGS+oJKE6mpqPXMCqKhHucN8cDkCdU8+21d1P7po3duC0HKBPLd1ApaeGqsVzLPTEmPW6Xgncfxw2/WS0MYmKzStQehkhD/vOH/1Hsh6JPkI1E2PPbQ5EyYk/kCm7r7ASHs+ilOM0iwjne7wV9547gIosDNuRw8F+UTSn+RQoKdjDJ/MvEMXoVcGuQJal/s1B+aT26+Kms+7qx9VhM1S2Ao6uMZP4vOLrGfCDnm3qlnqeUdoTImg+NEozu/HagRNwcrAS66s/Fs8NHoo0nfvHxvb2QMhekQxFwa7yKBdosfAT73k6YUF+3ts9COv1GKJq/kHAm01l83kduzvM9xZ4ZOItzRrtjh1CsYyNkp5fKvpRAN5IDkfAaP2nRF+N+Zc05YQUzBNouywuDbITIWCWw4+PZZXuCMqUc27t4fFLfS9omlb34Doe3cvia0OyTlU8m2jyJ/AgpCqN/b1JEJill1xQSAVqbtaZCVkJkefGLBJ13jXP0BJyB8v7FWn1iNzfOGhQaer0kUbuO39p0ImSF1vVkGm+vYxx30DrpqJ0u0aWQ4dzLTt8b/LejxpQUR8iJEtvroNxOfD6GzTjAookDHalbBvl9t7MwNJt+RhRBZFTv9HthLIBvCctgz9AtV4WbhxFmNflGgv42oV++mn5XMi86dIsxPk/6yDNjJQqkyoXkFXf78OKg59ub1OVd15k+rY6927Ocp9P3ftUsa+sRS/Dmk8J1799WYR7eGkkAKZXoRZt2x9jqv97nayQ3fbwSmdYXtglwOvsvM6jMLHb5nts78EdcA851MMixt3fpurClIPBncAq8Kk95dTpRwsOElrUsnJqSXTWu61ATyqZ7IDLW2vFhSty7A67PIHCyy0dH2f7L5+xmyeQllk/gC4fMSJHHLXoZajW+j2afDAHs0VPIK9aSl3Xk6oOoEzVFNFeRIW8byHTMlt0zj+vm8uTf7gR6NX5Y8R2x8qE5tvwlW+0UvAkDkLu12+tkzi3//8PSsLHWO+28m/2PSZ+mPRdBvv+WLFJSipi7rLRO02c2ENvhToEDiMbCnEX/K+Ga087mE4xY62S8/bZOv0cDSjomSNWWD3JiXJe424KjHWrYvBDVrIgKYYBc2MEfr2eMEocORpJiIMfTx4srZ9L3AWfGYBufeERJajwou5DHbP7Y6y+e8f/Xmb1hkuvMDaoSkyH4pDR/pkzEZ7lHYk562Ogpt8ZBmtk/cm5yE3/y77wQ8KDmTnG+PZJVqQQ5Os25aYMzvNMYd4OgllcZj1+2+yrKgqqSdjFeuytzccps6tnErPhpLHMq1i65xeT5iBQanweOcwATaBcR77q0NdXGtFKGbObsqeuXjrSLQ/Dvp7ays= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-edb50.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 8a568fe9-923e-4dd5-ddf5-08da101ceb26 X-MS-Exchange-CrossTenant-AuthSource: CY4PR04MB0567.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2022 18:09:22.0105 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR04MB5778 Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org From: Krzysztof Kozlowski dtschema expects DMA channels in specific order (tx, rx and tx-sec). The order actually should not matter because dma-names is used however let's make it aligned with dtschema to suppress warnings like: i2s@eee30000: dma-names: ['rx', 'tx', 'tx-sec'] is not valid under any of the given schemas Signed-off-by: Krzysztof Kozlowski Co-developed-by: Jonathan Bakker Signed-off-by: Jonathan Bakker --- Changes in v2: - Use pre-existing patch from Krzysztof, adding change to s5pv210-aries.dtsi which makes it continue to work - Drop changes to the sound-dai-cells --- arch/arm/boot/dts/s5pv210-aries.dtsi | 2 +- arch/arm/boot/dts/s5pv210.dtsi | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi index 116c507da028..8f37e34d08a4 100644 --- a/arch/arm/boot/dts/s5pv210-aries.dtsi +++ b/arch/arm/boot/dts/s5pv210-aries.dtsi @@ -635,7 +635,7 @@ }; &i2s0 { - dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>; + dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>; status = "okay"; }; diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi index 0bccfb9d0c0e..6a22b899e21d 100644 --- a/arch/arm/boot/dts/s5pv210.dtsi +++ b/arch/arm/boot/dts/s5pv210.dtsi @@ -239,8 +239,8 @@ reg = <0xeee30000 0x1000>; interrupt-parent = <&vic2>; interrupts = <16>; - dma-names = "rx", "tx", "tx-sec"; - dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>; + dma-names = "tx", "rx", "tx-sec"; + dmas = <&pdma1 10>, <&pdma1 9>, <&pdma1 11>; clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; @@ -259,8 +259,8 @@ reg = <0xe2100000 0x1000>; interrupt-parent = <&vic2>; interrupts = <17>; - dma-names = "rx", "tx"; - dmas = <&pdma1 12>, <&pdma1 13>; + dma-names = "tx", "rx"; + dmas = <&pdma1 13>, <&pdma1 12>; clock-names = "iis", "i2s_opclk0"; clocks = <&clocks CLK_I2S1>, <&clocks SCLK_AUDIO1>; pinctrl-names = "default"; @@ -274,8 +274,8 @@ reg = <0xe2a00000 0x1000>; interrupt-parent = <&vic2>; interrupts = <18>; - dma-names = "rx", "tx"; - dmas = <&pdma1 14>, <&pdma1 15>; + dma-names = "tx", "rx"; + dmas = <&pdma1 15>, <&pdma1 14>; clock-names = "iis", "i2s_opclk0"; clocks = <&clocks CLK_I2S2>, <&clocks SCLK_AUDIO2>; pinctrl-names = "default";