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: 13090037 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 97C66C3DA7D for ; Thu, 5 Jan 2023 14:43:03 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D4E5E11168; Thu, 5 Jan 2023 15:42:10 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D4E5E11168 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1672929780; bh=5s1KtwU1cLN7GL/X0OTK7kb5+a4WTKerZI29eSw9LMo=; h=From:To:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Cc:From; b=tx+W5ndICo+Fc9i/9XHGQ2sWSP5a1JnXT0VJXHESlbkU+jNAA6pcNtxWv9i8KJ7CH wMKJZ5v4LUJP5UVT+i1VGb3eaIkwwMs6eCKiSm8jHbH9bHkLLkZyghaL/wYH40d5qc 431oGHqQiJ47xkyJOxDB62kD4ZVmwE0U/vT2qklY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 8C7B0F804AA; Thu, 5 Jan 2023 15:42:10 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 55962F8022B; Thu, 5 Jan 2023 15:42:08 +0100 (CET) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id EBA39F8022B for ; Thu, 5 Jan 2023 15:42:00 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EBA39F8022B Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=xQKP2ZUz 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 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 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peng Fan , Alexander Stein , alsa-devel@alsa-project.org, Stefan Agner , Liam Girdwood , Laurent Pinchart , Krzysztof Kozlowski , Fabio Estevam , Marek Vasut , Markus Niebel , Paul Elder , NXP Linux Team , Tim Harvey , Sascha Hauer , devicetree@vger.kernel.org, Richard Zhu , Richard Cochran , Rob Herring , Adam Ford , Shengjiu Wang , Joakim Zhang , Mark Brown , Pengutronix Kernel Team , Shawn Guo , Lucas Stach Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" 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; }; From patchwork Thu Jan 5 14:41:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 13090038 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 4B761C3DA7A for ; Thu, 5 Jan 2023 14:43:14 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 9CC6E11173; Thu, 5 Jan 2023 15:42:21 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9CC6E11173 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1672929791; bh=XAEq1IpqhqrQT1Ek4NT/VJnD3LjWVY3ZPm6AowVk3FY=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=re9D0kvRt2soTfmZEX+Sbl/Su3D6TjgIOu7oO5CpKDruP1VWtxYIp+La5g3eCzzGP daFJk4judKQMSnHGXRnGvphNeU0BoIafKbHSMqwVs7hWido8A65yldwKtMmNb5BO09 LgRiBHGHW8cdDG5p1k2z66PrD3zfdvTCaIK7IMuQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 450EFF804DB; Thu, 5 Jan 2023 15:42:11 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0D42AF804AD; Thu, 5 Jan 2023 15:42:10 +0100 (CET) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C5F0FF80238 for ; Thu, 5 Jan 2023 15:42:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C5F0FF80238 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=YzYtQEbq 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 3EC728558F; Thu, 5 Jan 2023 15:42:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1672929721; bh=2NfDTdyL7tuqDMtAY9qdNesvPbrd0NfYG4zWugMDLC4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YzYtQEbqZlWetYqbbXPog74ISfNJUFg0WiGTVLBwzdXagqC0FD1/QW6pHHJ24Gnvt 7lsD6bnEWzCqJgt3CvlVMavkKhhtITLqRLrOqKq+WUWiIsAuvKV1KqITm2SwrWG1tV HzRjcq0QJX3Y31lsj9aJT1Og8b4BVbJQLzFHhOtEtvsS5/bGwtToitRGVKVszZVlRo 9dj5sczIHajeT1wPdjkBcFTqE6NiKeZqgZ95fmU0/ERniXNtHASW08NfqGVF312zTH 7dryUkNDQVHGEP6F80w98jSGTkevdoUUiJP8/aMXFd0zA+WQiM/7xoyN2cSPhnJpaD JW/8EPZ0CEcBQ== From: Marek Vasut To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ARM: dts: vfxxx: Swap SAI DMA order Date: Thu, 5 Jan 2023 15:41:45 +0100 Message-Id: <20230105144145.165010-2-marex@denx.de> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230105144145.165010-1-marex@denx.de> References: <20230105144145.165010-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peng Fan , Alexander Stein , alsa-devel@alsa-project.org, Stefan Agner , Liam Girdwood , Laurent Pinchart , Krzysztof Kozlowski , Fabio Estevam , Marek Vasut , Markus Niebel , Paul Elder , NXP Linux Team , Tim Harvey , Sascha Hauer , devicetree@vger.kernel.org, Richard Zhu , Richard Cochran , Rob Herring , Adam Ford , Shengjiu Wang , Joakim Zhang , Mark Brown , Pengutronix Kernel Team , Shawn Guo , Lucas Stach Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Swap the SAI dmas and dma-names to match the order documented in Documentation/devicetree/bindings/sound/fsl,sai.yaml No functional change. Signed-off-by: Marek Vasut --- 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 --- arch/arm/boot/dts/vfxxx.dtsi | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi index d53f9c9db8bfd..ff4479994b600 100644 --- a/arch/arm/boot/dts/vfxxx.dtsi +++ b/arch/arm/boot/dts/vfxxx.dtsi @@ -191,9 +191,8 @@ sai0: sai@4002f000 { <&clks VF610_CLK_SAI0_DIV>, <&clks 0>, <&clks 0>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dma-names = "tx", "rx"; - dmas = <&edma0 0 17>, - <&edma0 0 16>; + dma-names = "rx", "tx"; + dmas = <&edma0 0 16>, <&edma0 0 17>; status = "disabled"; }; @@ -205,9 +204,8 @@ sai1: sai@40030000 { <&clks VF610_CLK_SAI1_DIV>, <&clks 0>, <&clks 0>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dma-names = "tx", "rx"; - dmas = <&edma0 0 19>, - <&edma0 0 18>; + dma-names = "rx", "tx"; + dmas = <&edma0 0 18>, <&edma0 0 19>; status = "disabled"; }; @@ -219,9 +217,8 @@ sai2: sai@40031000 { <&clks VF610_CLK_SAI2_DIV>, <&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>; status = "disabled"; }; @@ -233,9 +230,8 @@ sai3: sai@40032000 { <&clks VF610_CLK_SAI3_DIV>, <&clks 0>, <&clks 0>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dma-names = "tx", "rx"; - dmas = <&edma0 1 9>, - <&edma0 1 8>; + dma-names = "rx", "tx"; + dmas = <&edma0 1 8>, <&edma0 1 9>; status = "disabled"; };