From patchwork Tue Jul 2 06:30:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 2810941 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 6AC5BBF4A1 for ; Tue, 2 Jul 2013 06:58:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7122E2014C for ; Tue, 2 Jul 2013 06:58:47 +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 E896A20136 for ; Tue, 2 Jul 2013 06:58:45 +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 1UtuWy-0002Yq-BT; Tue, 02 Jul 2013 06:57:41 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UtuWl-00089u-Gl; Tue, 02 Jul 2013 06:57:27 +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 1UtuWV-00086t-EM for linux-arm-kernel@lists.infradead.org; Tue, 02 Jul 2013 06:57:14 +0000 Received: from mail125-db8-R.bigfish.com (10.174.8.231) by DB8EHSOBE013.bigfish.com (10.174.4.76) with Microsoft SMTP Server id 14.1.225.23; Tue, 2 Jul 2013 06:56:48 +0000 Received: from mail125-db8 (localhost [127.0.0.1]) by mail125-db8-R.bigfish.com (Postfix) with ESMTP id AF3F734007B; Tue, 2 Jul 2013 06:56:48 +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: 3 X-BigFish: VS3(zzzz1f42h1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6h1082kzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dfeh1dffh1e23h1155h) Received: from mail125-db8 (localhost.localdomain [127.0.0.1]) by mail125-db8 (MessageSwitch) id 1372748207578899_17844; Tue, 2 Jul 2013 06:56:47 +0000 (UTC) Received: from DB8EHSMHS002.bigfish.com (unknown [10.174.8.251]) by mail125-db8.bigfish.com (Postfix) with ESMTP id 7EAD9160045; Tue, 2 Jul 2013 06:56:47 +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; Tue, 2 Jul 2013 06:56:46 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.2.328.11; Tue, 2 Jul 2013 06:56:45 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r626uYXx030011; Mon, 1 Jul 2013 23:56:42 -0700 From: Huang Shijie To: Subject: [PATCH 3/5] ARM: dts: imx6: rename the uart's compatible property Date: Tue, 2 Jul 2013 14:30:26 +0800 Message-ID: <1372746628-20092-4-git-send-email-b32955@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1372746628-20092-1-git-send-email-b32955@freescale.com> References: <1372746628-20092-1-git-send-email-b32955@freescale.com> 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-20130702_025711_758062_4EEE585D X-CRM114-Status: UNSURE ( 7.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Huang Shijie , s.hauer@pengutronix.de, shawn.guo@linaro.org, linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.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.2 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 The imx6 uart can supports the DMA, imx uart driver has added a new compatible property for the imx6 uart. In order to enable the DMA for some uart port in imx6, we rename the uart's compatible property to "fsl,imx6-uart". Signed-off-by: Huang Shijie --- arch/arm/boot/dts/imx6qdl.dtsi | 10 +++++----- arch/arm/boot/dts/imx6sl.dtsi | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 0509344..d4ab0ee 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -179,7 +179,7 @@ }; uart1: serial@02020000 { - compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; + compatible = "fsl,imx6-uart"; reg = <0x02020000 0x4000>; interrupts = <0 26 0x04>; clocks = <&clks 160>, <&clks 161>; @@ -787,7 +787,7 @@ }; uart2: serial@021e8000 { - compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; + compatible = "fsl,imx6-uart"; reg = <0x021e8000 0x4000>; interrupts = <0 27 0x04>; clocks = <&clks 160>, <&clks 161>; @@ -796,7 +796,7 @@ }; uart3: serial@021ec000 { - compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; + compatible = "fsl,imx6-uart"; reg = <0x021ec000 0x4000>; interrupts = <0 28 0x04>; clocks = <&clks 160>, <&clks 161>; @@ -805,7 +805,7 @@ }; uart4: serial@021f0000 { - compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; + compatible = "fsl,imx6-uart"; reg = <0x021f0000 0x4000>; interrupts = <0 29 0x04>; clocks = <&clks 160>, <&clks 161>; @@ -814,7 +814,7 @@ }; uart5: serial@021f4000 { - compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; + compatible = "fsl,imx6-uart"; reg = <0x021f4000 0x4000>; interrupts = <0 30 0x04>; clocks = <&clks 160>, <&clks 161>; diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 9138c67..ca1527f 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -152,7 +152,7 @@ }; uart5: serial@02018000 { - compatible = "fsl,imx6sl-uart", "fsl,imx21-uart"; + compatible = "fsl,imx6-uart"; reg = <0x02018000 0x4000>; interrupts = <0 30 0x04>; clocks = <&clks IMX6SL_CLK_UART>, @@ -162,7 +162,7 @@ }; uart1: serial@02020000 { - compatible = "fsl,imx6sl-uart", "fsl,imx21-uart"; + compatible = "fsl,imx6-uart"; reg = <0x02020000 0x4000>; interrupts = <0 26 0x04>; clocks = <&clks IMX6SL_CLK_UART>, @@ -172,7 +172,7 @@ }; uart2: serial@02024000 { - compatible = "fsl,imx6sl-uart", "fsl,imx21-uart"; + compatible = "fsl,imx6-uart"; reg = <0x02024000 0x4000>; interrupts = <0 27 0x04>; clocks = <&clks IMX6SL_CLK_UART>, @@ -209,7 +209,7 @@ }; uart3: serial@02034000 { - compatible = "fsl,imx6sl-uart", "fsl,imx21-uart"; + compatible = "fsl,imx6-uart"; reg = <0x02034000 0x4000>; interrupts = <0 28 0x04>; clocks = <&clks IMX6SL_CLK_UART>, @@ -219,7 +219,7 @@ }; uart4: serial@02038000 { - compatible = "fsl,imx6sl-uart", "fsl,imx21-uart"; + compatible = "fsl,imx6-uart"; reg = <0x02038000 0x4000>; interrupts = <0 29 0x04>; clocks = <&clks IMX6SL_CLK_UART>,