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: 13090579 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 A91D6C4708E for ; Thu, 5 Jan 2023 21:56:50 +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=10MTM2Lo0yKsLhH9gDuqxqN0a16LgTcomBmNIPO+53Y=; b=BwFlKV87S0I2Ph 9UAul60JkDKLjXQVbZT3EI/Wd2R2NNDe7oaLcV15i7ZvWtwkhIXBbKpNjzg54tBnFIJqLBUXlABFu qXUXP+99mC7hA05NhQtnfDK0XdLoUXSgmALxUWAWSqQqs9pP0GTTf5tiD+Yo/7eueCcw6dxmGKAFB UE5U62XCngG3lO8CDjeOxIzequCEGG7xwGeSqIsdVOPyVkUQN3SFoUQkCeQBrr1pZIjxc7CmQvLLT x2yswLuR5TzqTFBY9724QzHE/bX41DhhnACZBfkq8SX1oIi/zfCUGznbvv9Fr3Dgj3505APGrr7tb GKu1dx91vCc3O/xDtLTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDYDC-00FKZK-HK; Thu, 05 Jan 2023 21:55:47 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDV5l-00DgdM-5X for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:35:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=P+0Qo4nN3rJriPnghe4osYRl64VJHMO2uLo+zGykihY=; b=eFFJZMwUA+RVpt9RFo9ouYlsH5 hfd2iPlA/GaCmlxaeOROdmUEQFkpcHsFEcNys/wTRmcs6HCSXaEm0Xopz5yt+tmZkchEscBUlpg6F ShNe6+lIrQTrsz8hDhgWzuscd665+Jn18BErV8fAP5XsT84VLJxWn9/xgNGN00UR/ZD5+m/BajzEN TicC+M6gSZJm+3D7N9X5VPEsBv/+u4juGwzn+l9tkh8jLJfEhET/JRunWGQfq7ko13/fkOLiEs761 4Q8m1l+fN9gqddeX3rxDNSVBo66CbqKVde69GOM2dEdbZZ9PD7rawvZYtUnukbY+ilp/IvergV3gz WKwvGt6A==; Received: from phobos.denx.de ([2a01:238:438b:c500:173d:9f52:ddab:ee01]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDRRM-001OW5-1N for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 14:41:58 +0000 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_144156_790438_6200B86F X-CRM114-Status: GOOD ( 12.18 ) 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 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: 13090660 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 7822EC4708E for ; Thu, 5 Jan 2023 22:59:50 +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:References:In-Reply-To: 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: List-Owner; bh=Iwf/FjiBthpf3MNp0wR4dv/vu2UgJGAeqBJWHj7c/yI=; b=G0BRSSgAIM7ait kQcBrpWxTdmlpKtywu6tZzR7w3x0hTopZTpnCT/NPw7dDpzG8x0FrzLjFdaCvRJW25thRItKNLLvE AwqlbLfHkl8C7AKMB09ajO0isHKrA6Jlz9Fm2A+DWjj8D0iSfwij0occhaqyDjak99JR5NxuwN3IX M+S4Kno+x6UenXiC1MAIUnUhMPHlg2dxaipzqCq8wH07If8925eeAaihKyZnO4waDlnS6hwMedjQv YXbUudf2TLVu8NBUXnagcUJESXhn4lAZytjLtYdzGBzZlW1ZsfJskPCm5pGa1+sETxP20KFJttluI zwgyYOv0z4YH7cXochmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDZC7-00Fs0d-AL; Thu, 05 Jan 2023 22:58:43 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVQM-00DtMl-LS for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:57:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=2NfDTdyL7tuqDMtAY9qdNesvPbrd0NfYG4zWugMDLC4=; b=lWaFb/QGHB6vFN4LFLulerG80s /IYK1scZWb6+eDJbWjPpRHrukei/ZLA/pC4vLiIADbOUY+3hYDCGB4yk5nxySlK1LL56Kb04dH+kV 3DEzIoTX6SGWIUMuV411brAe60yuNQ9rrAL1C5NP46KGigXR2+3VXXa6TCjJpnDM5AeE3sv4m+tlv ZQIDM8mhEcto9dG0eWqY4rK9dlMTnNyu7nUOaa+Fe48TSlHeDR9bcVMQQsC73lsFQpFz5CvUlMReY 29Kfr9Rg5KsdKQHO1vCnk/K3DfxzZM4Hv9j9gzE9eWHMWRyALMt5r/wh++iClv7aVSnkWyt4+0CQi Ovs+yDHA==; Received: from phobos.denx.de ([85.214.62.61]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDRRN-001OWJ-0w for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 14:41:59 +0000 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 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_144157_485932_19533FDD X-CRM114-Status: GOOD ( 12.59 ) 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 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"; };