From patchwork Tue Dec 19 12:34:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 13498220 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 BBEF0C46CCD for ; Tue, 19 Dec 2023 12:35:17 +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=3iHsXv9mx86r2jrCPy5wW0QakzSMoUWMQzmjZbNXZEw=; b=ZnzlhQRexCVKap WyPkarKQFpJ6UsQtzCM5IS5LYg+aTSlZmLPt5SW2gW42+2SLcF6GCLq1LeT8F2zoiKWDP/4cEqwV7 1NtPhUiGnbTltHiZ7uYZcgSuAiQ+mWHEv283vSPuN00Sq8+YYXmDgmeZOE6i0zQioumBlsa2wEVJW QElhjAKLBTirJZfYWpVvhC3xSoyvaTLFIRsKp+1yHHssb6pcC50/9iaXYJQgu7C0Y3dkVJh3q/629 PkR2pDdPUq+5pYjTDjHvYzatT8htAqEIGq5rBuACdfXa1IeH9d06dPNfHcBMy2j3TtzlHCHbHZA0V PVmzefLHYoqSd3vT56pA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rFZJ8-00E2G9-0Q; Tue, 19 Dec 2023 12:34:46 +0000 Received: from mx1.tq-group.com ([93.104.207.81]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rFZJ5-00E2Dk-0w for linux-arm-kernel@lists.infradead.org; Tue, 19 Dec 2023 12:34:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1702989283; x=1734525283; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=qULu1jXJ+mZx5egdHeQ5qjRxTtgo3XOVkFwjP86id40=; b=ktIDCWE8WAeJQRKkEiK4PUgWgltGj7axvQIBuK5+aIDJ4ZJhw69YPDLO O1uG+oXcwIY+h+2zPT5d26BQK+Dv2zClb68a+40TsOYWd4J8vlRnnXhWh HopzV2+kkSydPqhc5NGPeYruEDpwiT0zQjSmpTAde5n/CHFIA6x5g1FtH pSuxKClBEQKAH12Z4VAil5rQ1njlM1VEtPSnaJFdXi6qIOoagZlCl7uZo 8OJMycTXG7TULez/3tyqq903OfzzV5JnkchU4CyvfFrWrGIomC+oHaRfD UdVJUWZclabHIz+ByeEr9+hdGDF1fu1WQ8rEOsqcJb/sp4LsK8g3shTdM Q==; X-IronPort-AV: E=Sophos;i="6.04,288,1695679200"; d="scan'208";a="34586423" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 19 Dec 2023 13:34:40 +0100 Received: from steina-w.tq-net.de (steina-w.tq-net.de [10.123.53.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 3D88D280075; Tue, 19 Dec 2023 13:34:40 +0100 (CET) From: Alexander Stein To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Alexander Stein , Pengutronix Kernel Team , NXP Linux Team , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] arm64: dts: freescale: imx8-ss-dma: Fix edma3's location Date: Tue, 19 Dec 2023 13:34:38 +0100 Message-Id: <20231219123439.3359318-1-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231219_043443_633743_ECA77B21 X-CRM114-Status: UNSURE ( 9.43 ) X-CRM114-Notice: Please train this message. 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 Sort nodes by base address. edma3 comes later in the memory map. Signed-off-by: Alexander Stein --- .../arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi index b0bb77150adc..a180893ac81e 100644 --- a/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi @@ -192,29 +192,6 @@ edma2: dma-controller@5a1f0000 { <&pd IMX_SC_R_DMA_2_CH15>; }; - edma3: dma-controller@5a9f0000 { - compatible = "fsl,imx8qm-edma"; - reg = <0x5a9f0000 0x90000>; - #dma-cells = <3>; - dma-channels = <8>; - interrupts = , - , - , - , - , - , - , - ; - power-domains = <&pd IMX_SC_R_DMA_3_CH0>, - <&pd IMX_SC_R_DMA_3_CH1>, - <&pd IMX_SC_R_DMA_3_CH2>, - <&pd IMX_SC_R_DMA_3_CH3>, - <&pd IMX_SC_R_DMA_3_CH4>, - <&pd IMX_SC_R_DMA_3_CH5>, - <&pd IMX_SC_R_DMA_3_CH6>, - <&pd IMX_SC_R_DMA_3_CH7>; - }; - spi0_lpcg: clock-controller@5a400000 { compatible = "fsl,imx8qxp-lpcg"; reg = <0x5a400000 0x10000>; @@ -460,6 +437,29 @@ flexcan3: can@5a8f0000 { status = "disabled"; }; + edma3: dma-controller@5a9f0000 { + compatible = "fsl,imx8qm-edma"; + reg = <0x5a9f0000 0x90000>; + #dma-cells = <3>; + dma-channels = <8>; + interrupts = , + , + , + , + , + , + , + ; + power-domains = <&pd IMX_SC_R_DMA_3_CH0>, + <&pd IMX_SC_R_DMA_3_CH1>, + <&pd IMX_SC_R_DMA_3_CH2>, + <&pd IMX_SC_R_DMA_3_CH3>, + <&pd IMX_SC_R_DMA_3_CH4>, + <&pd IMX_SC_R_DMA_3_CH5>, + <&pd IMX_SC_R_DMA_3_CH6>, + <&pd IMX_SC_R_DMA_3_CH7>; + }; + i2c0_lpcg: clock-controller@5ac00000 { compatible = "fsl,imx8qxp-lpcg"; reg = <0x5ac00000 0x10000>; From patchwork Tue Dec 19 12:34:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 13498219 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 EB90CC41535 for ; Tue, 19 Dec 2023 12:35:16 +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=Mzp5yQMrncubRdRAIs5sGc+Zic1yf2NSAO9P9bfA1Ps=; b=F4uY8eaUEIrTN0 uW4TRGv+f55Rjq3q14wrB9XCACLdJUd9YaHW8DJoWh0jU7ojWVZydoACyI2lOG9dNiVXz19uwLh8v HBfh5rzo5fiRQEOQ9831sW+LJKg98+OqAgrOojItdVr2i57nW+bjxSAl6V3kcA3zn+43YtwM1JQ9M BUzLY4clfDpbympH9xE3sNFMtEs9Hgy/5jCpxyBIXJ/Elo2jcMYIb4OwbzIh8qkFjryNk38sL9KFb HLFihgbNtomzyqSEj1tOSQJmiTpWmOYwD2/+OdhfAMPBETHeIgk1D5BEUo8bXW8c6WjOkHFetOcIx hjapZ3uwffROcBkhGzhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rFZJE-00E2Hj-39; Tue, 19 Dec 2023 12:34:52 +0000 Received: from mx1.tq-group.com ([93.104.207.81]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rFZJ7-00E2Dk-1O for linux-arm-kernel@lists.infradead.org; Tue, 19 Dec 2023 12:34:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1702989285; x=1734525285; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WWTF/q1urjBpYGjn2DODNi9niiH26mYw3FlZz7HcEDo=; b=G2MpQzxxjO+4SIG6D0Xr2iPpRpBJ/bER+7J85XmDJCBMsxOpLxhm4L26 ogshqqAIdcfQLlvuNL36fHJ1CtC3sGmHVHBMZbITGf7Gq6gzC8PMtYfcF lkOxVW67epqogk2zIS8FOm0TTrprZ02QYAECyXjNKzNFTuMjd85RZDTBQ F0s6yIeB/AAVjUkuFzyBNIc/F03g0NkoWnySGGL5m9L8aNTxpVnSZKJFZ 2p9YgvbxXZjzZKPQJLLrTTuWtDrONatT2kd8PlVbnEtyYGoaR691UBf3N iczkoOmnxOVv0AkKIFCklZeNhYZKWHu+45DfTGGSzIh2i6TWNUVhFBFKw w==; X-IronPort-AV: E=Sophos;i="6.04,288,1695679200"; d="scan'208";a="34586424" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 19 Dec 2023 13:34:41 +0100 Received: from steina-w.tq-net.de (steina-w.tq-net.de [10.123.53.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id D4037280084; Tue, 19 Dec 2023 13:34:40 +0100 (CET) From: Alexander Stein To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Alexander Stein , Pengutronix Kernel Team , NXP Linux Team , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] arm64: dts: imx8: Fix lpuart DMA channel order Date: Tue, 19 Dec 2023 13:34:39 +0100 Message-Id: <20231219123439.3359318-2-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231219123439.3359318-1-alexander.stein@ew.tq-group.com> References: <20231219123439.3359318-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231219_043445_788022_74542EAF X-CRM114-Status: GOOD ( 10.33 ) 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 Bindings say DMA channels are in order Rx, Tx. Adjust the DT nodes accordingly. Signed-off-by: Alexander Stein --- arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi index a180893ac81e..0f48796e32b2 100644 --- a/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi @@ -93,8 +93,8 @@ lpuart0: serial@5a060000 { assigned-clocks = <&clk IMX_SC_R_UART_0 IMX_SC_PM_CLK_PER>; assigned-clock-rates = <80000000>; power-domains = <&pd IMX_SC_R_UART_0>; - dma-names = "tx","rx"; - dmas = <&edma2 9 0 0>, <&edma2 8 0 1>; + dma-names = "rx", "tx"; + dmas = <&edma2 8 0 0>, <&edma2 9 0 1>; status = "disabled"; }; @@ -107,8 +107,8 @@ lpuart1: serial@5a070000 { assigned-clocks = <&clk IMX_SC_R_UART_1 IMX_SC_PM_CLK_PER>; assigned-clock-rates = <80000000>; power-domains = <&pd IMX_SC_R_UART_1>; - dma-names = "tx","rx"; - dmas = <&edma2 11 0 0>, <&edma2 10 0 1>; + dma-names = "rx", "tx"; + dmas = <&edma2 10 0 0>, <&edma2 11 0 1>; status = "disabled"; }; @@ -121,8 +121,8 @@ lpuart2: serial@5a080000 { assigned-clocks = <&clk IMX_SC_R_UART_2 IMX_SC_PM_CLK_PER>; assigned-clock-rates = <80000000>; power-domains = <&pd IMX_SC_R_UART_2>; - dma-names = "tx","rx"; - dmas = <&edma2 13 0 0>, <&edma2 12 0 1>; + dma-names = "rx", "tx"; + dmas = <&edma2 12 0 0>, <&edma2 13 0 1>; status = "disabled"; }; @@ -135,8 +135,8 @@ lpuart3: serial@5a090000 { assigned-clocks = <&clk IMX_SC_R_UART_3 IMX_SC_PM_CLK_PER>; assigned-clock-rates = <80000000>; power-domains = <&pd IMX_SC_R_UART_3>; - dma-names = "tx","rx"; - dmas = <&edma2 15 0 0>, <&edma2 14 0 1>; + dma-names = "rx", "tx"; + dmas = <&edma2 14 0 0>, <&edma2 15 0 1>; status = "disabled"; };