From patchwork Fri Jul 12 10:02:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 2826897 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 96163C0AB2 for ; Fri, 12 Jul 2013 10:31:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3DEA12016A for ; Fri, 12 Jul 2013 10:31:10 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9A5922012D for ; Fri, 12 Jul 2013 10:31:08 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uxacy-0007Nu-9y; Fri, 12 Jul 2013 10:31:04 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uxacv-0006Ko-Ta; Fri, 12 Jul 2013 10:31:01 +0000 Received: from mail-db8lp0186.outbound.messaging.microsoft.com ([213.199.154.186] helo=db8outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uxacs-0006Ji-IA for linux-arm-kernel@lists.infradead.org; Fri, 12 Jul 2013 10:30:59 +0000 Received: from mail114-db8-R.bigfish.com (10.174.8.230) by DB8EHSOBE039.bigfish.com (10.174.4.102) with Microsoft SMTP Server id 14.1.225.22; Fri, 12 Jul 2013 10:30:36 +0000 Received: from mail114-db8 (localhost [127.0.0.1]) by mail114-db8-R.bigfish.com (Postfix) with ESMTP id A526F10014D; Fri, 12 Jul 2013 10:30:36 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 6 X-BigFish: VS6(zcb8kzzz1f42h1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6h1082kzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1e23h1155h) Received: from mail114-db8 (localhost.localdomain [127.0.0.1]) by mail114-db8 (MessageSwitch) id 137362503530833_9763; Fri, 12 Jul 2013 10:30:35 +0000 (UTC) Received: from DB8EHSMHS002.bigfish.com (unknown [10.174.8.241]) by mail114-db8.bigfish.com (Postfix) with ESMTP id E2983420031; Fri, 12 Jul 2013 10:30:34 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB8EHSMHS002.bigfish.com (10.174.4.12) with Microsoft SMTP Server (TLS) id 14.16.227.3; Fri, 12 Jul 2013 10:30:34 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.3.136.1; Fri, 12 Jul 2013 10:29:38 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r6CAUROp005667; Fri, 12 Jul 2013 03:30:31 -0700 From: Huang Shijie To: Subject: [PATCH] ARM: dts: imx6qdl/imx6sl: add the dma property for uart Date: Fri, 12 Jul 2013 18:02:09 +0800 Message-ID: <1373623329-18204-1-git-send-email-b32955@freescale.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130712_063058_813861_CF5AC667 X-CRM114-Status: UNSURE ( 7.86 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Huang Shijie , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the dma property for all the uart. Note: Add the dma property does not mean we enable the dma for this uart. Signed-off-by: Huang Shijie --- arch/arm/boot/dts/imx6q-arm2.dts | 2 -- arch/arm/boot/dts/imx6qdl.dtsi | 10 ++++++++++ arch/arm/boot/dts/imx6sl.dtsi | 10 ++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts index 9b17393..edf1bd9 100644 --- a/arch/arm/boot/dts/imx6q-arm2.dts +++ b/arch/arm/boot/dts/imx6q-arm2.dts @@ -102,8 +102,6 @@ pinctrl-0 = <&pinctrl_uart2_2>; fsl,dte-mode; fsl,uart-has-rtscts; - dma-names = "rx", "tx"; - dmas = <&sdma 27 4 0>, <&sdma 28 4 0>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 72a28d6..34ffc2e 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -197,6 +197,8 @@ interrupts = <0 26 0x04>; clocks = <&clks 160>, <&clks 161>; clock-names = "ipg", "per"; + dma-names = "rx", "tx"; + dmas = <&sdma 25 4 0>, <&sdma 26 4 0>; status = "disabled"; }; @@ -1479,6 +1481,8 @@ interrupts = <0 27 0x04>; clocks = <&clks 160>, <&clks 161>; clock-names = "ipg", "per"; + dma-names = "rx", "tx"; + dmas = <&sdma 27 4 0>, <&sdma 28 4 0>; status = "disabled"; }; @@ -1488,6 +1492,8 @@ interrupts = <0 28 0x04>; clocks = <&clks 160>, <&clks 161>; clock-names = "ipg", "per"; + dma-names = "rx", "tx"; + dmas = <&sdma 29 4 0>, <&sdma 30 4 0>; status = "disabled"; }; @@ -1497,6 +1503,8 @@ interrupts = <0 29 0x04>; clocks = <&clks 160>, <&clks 161>; clock-names = "ipg", "per"; + dma-names = "rx", "tx"; + dmas = <&sdma 31 4 0>, <&sdma 32 4 0>; status = "disabled"; }; @@ -1506,6 +1514,8 @@ interrupts = <0 30 0x04>; clocks = <&clks 160>, <&clks 161>; clock-names = "ipg", "per"; + dma-names = "rx", "tx"; + dmas = <&sdma 33 4 0>, <&sdma 34 4 0>; status = "disabled"; }; }; diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 0a297af..230ee86 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -159,6 +159,8 @@ clocks = <&clks IMX6SL_CLK_UART>, <&clks IMX6SL_CLK_UART_SERIAL>; clock-names = "ipg", "per"; + dma-names = "rx", "tx"; + dmas = <&sdma 33 4 0>, <&sdma 34 4 0>; status = "disabled"; }; @@ -170,6 +172,8 @@ clocks = <&clks IMX6SL_CLK_UART>, <&clks IMX6SL_CLK_UART_SERIAL>; clock-names = "ipg", "per"; + dma-names = "rx", "tx"; + dmas = <&sdma 25 4 0>, <&sdma 26 4 0>; status = "disabled"; }; @@ -181,6 +185,8 @@ clocks = <&clks IMX6SL_CLK_UART>, <&clks IMX6SL_CLK_UART_SERIAL>; clock-names = "ipg", "per"; + dma-names = "rx", "tx"; + dmas = <&sdma 27 4 0>, <&sdma 28 4 0>; status = "disabled"; }; @@ -219,6 +225,8 @@ clocks = <&clks IMX6SL_CLK_UART>, <&clks IMX6SL_CLK_UART_SERIAL>; clock-names = "ipg", "per"; + dma-names = "rx", "tx"; + dmas = <&sdma 29 4 0>, <&sdma 30 4 0>; status = "disabled"; }; @@ -230,6 +238,8 @@ clocks = <&clks IMX6SL_CLK_UART>, <&clks IMX6SL_CLK_UART_SERIAL>; clock-names = "ipg", "per"; + dma-names = "rx", "tx"; + dmas = <&sdma 31 4 0>, <&sdma 32 4 0>; status = "disabled"; }; };