From patchwork Fri Mar 7 19:13:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 3794331 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 B3422BF540 for ; Fri, 7 Mar 2014 19:35:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D4B3520328 for ; Fri, 7 Mar 2014 19:35:47 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E2D5320265 for ; Fri, 7 Mar 2014 19:35:46 +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 1WM0GS-0004kE-Nn; Fri, 07 Mar 2014 19:17:03 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WM0Fj-0003Pk-Al; Fri, 07 Mar 2014 19:16:15 +0000 Received: from mail-ig0-x229.google.com ([2607:f8b0:4001:c05::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WM0Ec-0003G1-Jt for linux-arm-kernel@lists.infradead.org; Fri, 07 Mar 2014 19:15:08 +0000 Received: by mail-ig0-f169.google.com with SMTP id h18so3164178igc.0 for ; Fri, 07 Mar 2014 11:14:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=2+kYVUyvgqQr8Kwp8yPCMQab2TURVKExSs0xB1NuwzI=; b=LmsYxFbgnN6wtSZ1DPfn6pIrnbNJWD2buiNu0DR40vP/cMM58hoVdkzPjo4tisrSBh Pvm0Ek+9jqyeCg+8fGh/cy7IhyKxo9Ig0SSHkm6MmUXDQsCXkzDz2iiqa4ju93/HPawp g7klspi0CEIH3DuVTQjrHdhEMKR2x01sM8Hj+Nxo9sdUQlXKzYFqAfjjM1QR4w84L/5q WCoc9/YXFKyy/SDlz2K+BzTG9CrQoFfPqFuGPxYVmJwJINisthrpvWruxuXgeO8BAd0T 1CV0Kja0/J9LLFlBgMIXXi/8xXZZqYyYOwMOWYo16cPwkV6K+8AJaJ+c+x2jJI3dZBHH tpUQ== X-Received: by 10.42.50.3 with SMTP id y3mr16632117icf.12.1394219687700; Fri, 07 Mar 2014 11:14:47 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id pn6sm5383124igb.4.2014.03.07.11.14.45 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 07 Mar 2014 11:14:46 -0800 (PST) From: Soren Brinkmann To: Russell King , Greg Kroah-Hartman , Jiri Slaby , Arnd Bergmann , One Thousand Gnomes Subject: [PATCH RFC v2 11/11] ARM: zynq: DT: Migrate UART to Cadence binding Date: Fri, 7 Mar 2014 11:13:34 -0800 Message-Id: <1394219614-3197-12-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.9.0.1.g4196000 In-Reply-To: <1394219614-3197-1-git-send-email-soren.brinkmann@xilinx.com> References: <1394219614-3197-1-git-send-email-soren.brinkmann@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140307_141506_760695_C72A25D7 X-CRM114-Status: UNSURE ( 8.65 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Peter Crosthwaite , Michal Simek , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.org, Soren Brinkmann 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: , MIME-Version: 1.0 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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Zynq UART is Cadence IP and the driver has been renamed accordingly. Migrate the DT to use the new binding for the UART driver. Signed-off-by: Soren Brinkmann Acked-by: Peter Crosthwaite Acked-by: Rob Herring --- arch/arm/boot/dts/zynq-7000.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index 8b67b19392ec..0ed0d4b0579a 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -67,19 +67,19 @@ }; uart0: uart@e0000000 { - compatible = "xlnx,xuartps"; + compatible = "xlnx,xuartps", "cdns,uart-r1p8"; status = "disabled"; clocks = <&clkc 23>, <&clkc 40>; - clock-names = "ref_clk", "aper_clk"; + clock-names = "uart_clk", "pclk"; reg = <0xE0000000 0x1000>; interrupts = <0 27 4>; }; uart1: uart@e0001000 { - compatible = "xlnx,xuartps"; + compatible = "xlnx,xuartps", "cdns,uart-r1p8"; status = "disabled"; clocks = <&clkc 24>, <&clkc 41>; - clock-names = "ref_clk", "aper_clk"; + clock-names = "uart_clk", "pclk"; reg = <0xE0001000 0x1000>; interrupts = <0 50 4>; };