From patchwork Thu Jan 5 14:41:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 639460 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 BEFFBC3DA7A for ; Thu, 5 Jan 2023 14:42:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232541AbjAEOmF (ORCPT ); Thu, 5 Jan 2023 09:42:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233426AbjAEOmE (ORCPT ); Thu, 5 Jan 2023 09:42:04 -0500 Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D124B15F00 for ; Thu, 5 Jan 2023 06:42:02 -0800 (PST) Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 0835E85248; Thu, 5 Jan 2023 15:41:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1672929720; bh=P+0Qo4nN3rJriPnghe4osYRl64VJHMO2uLo+zGykihY=; h=From:To:Cc:Subject:Date:From; b=xQKP2ZUzr1dKjnQVQBshOI+e3BJCLgZaoQCaRuJLOjiqP0CsNoY318VqU3z9guiNb U0hYFpxTsyvyh/orYPWwo8QRFUAxzmNdW7e66VdPEoMhHga7yVXJdQbT9lw4SoUfPB flPn9IWUyFMhv4zCW67dw4QxAJMevtENvAItv4s0p2y8ue3t9x/bYSXY0wbrnxxnR7 JxL4LT64cAMDfohdlE4HD9SdyQxqmA6cv3g2NQs2Ua6j0bP1g48Jv5b8R1pJtCIA5X k4fyjNdvfotxDaVZ4rvDUhXcfdFMosBUofHA5+dS70q7ahceoe4RlMY0p+Qn1OI/sK 3jP+VjYsrH0Mg== From: Marek Vasut To: linux-arm-kernel@lists.infradead.org Cc: Marek Vasut , Adam Ford , Alexander Stein , Fabio Estevam , Joakim Zhang , Krzysztof Kozlowski , Laurent Pinchart , Liam Girdwood , Lucas Stach , Mark Brown , Markus Niebel , NXP Linux Team , Paul Elder , Peng Fan , Pengutronix Kernel Team , Richard Cochran , Richard Zhu , Rob Herring , Sascha Hauer , Shawn Guo , Shengjiu Wang , Stefan Agner , Tim Harvey , alsa-devel@alsa-project.org, devicetree@vger.kernel.org Subject: [PATCH 1/2] ASoC: dt-bindings: fsl-sai: Simplify the VFxxx dmas binding Date: Thu, 5 Jan 2023 15:41:44 +0100 Message-Id: <20230105144145.165010-1-marex@denx.de> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Get rid of the vf610 sai special case, instead update the vfxxx.dtsi DT to use the same DMA channel ordering as all the other devices. The sai DMA channel ordering has not been aligned with other IP DMA channel ordering in the vfxxx.dtsi anyway. Signed-off-by: Marek Vasut Reviewed-by: Krzysztof Kozlowski --- Cc: Adam Ford Cc: Alexander Stein Cc: Fabio Estevam Cc: Joakim Zhang Cc: Krzysztof Kozlowski Cc: Laurent Pinchart Cc: Liam Girdwood Cc: Lucas Stach Cc: Marek Vasut Cc: Mark Brown Cc: Markus Niebel Cc: NXP Linux Team Cc: Paul Elder Cc: Peng Fan Cc: Pengutronix Kernel Team Cc: Richard Cochran Cc: Richard Zhu Cc: Rob Herring Cc: Sascha Hauer Cc: Shawn Guo Cc: Shengjiu Wang Cc: Stefan Agner Cc: Tim Harvey Cc: alsa-devel@alsa-project.org Cc: devicetree@vger.kernel.org To: linux-arm-kernel@lists.infradead.org --- .../devicetree/bindings/sound/fsl,sai.yaml | 38 ++++--------------- 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/fsl,sai.yaml b/Documentation/devicetree/bindings/sound/fsl,sai.yaml index 7e56337d8edc1..088c26b001cc0 100644 --- a/Documentation/devicetree/bindings/sound/fsl,sai.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,sai.yaml @@ -76,10 +76,14 @@ properties: minItems: 4 dmas: - maxItems: 2 + items: + - description: DMA controller phandle and request line for RX + - description: DMA controller phandle and request line for TX dma-names: - maxItems: 2 + items: + - const: rx + - const: tx interrupts: items: @@ -142,31 +146,6 @@ properties: allOf: - $ref: dai-common.yaml# - - if: - properties: - compatible: - contains: - const: fsl,vf610-sai - then: - properties: - dmas: - items: - - description: DMA controller phandle and request line for TX - - description: DMA controller phandle and request line for RX - dma-names: - items: - - const: tx - - const: rx - else: - properties: - dmas: - items: - - description: DMA controller phandle and request line for RX - - description: DMA controller phandle and request line for TX - dma-names: - items: - - const: rx - - const: tx - if: required: - fsl,sai-asynchronous @@ -199,9 +178,8 @@ examples: <&clks VF610_CLK_SAI2>, <&clks 0>, <&clks 0>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dma-names = "tx", "rx"; - dmas = <&edma0 0 21>, - <&edma0 0 20>; + dma-names = "rx", "tx"; + dmas = <&edma0 0 20>, <&edma0 0 21>; big-endian; lsb-first; };