From patchwork Sat Apr 5 00:23:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 3941681 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 B106BBFF02 for ; Sat, 5 Apr 2014 00:29:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F06F520381 for ; Sat, 5 Apr 2014 00:29:01 +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 09CA420225 for ; Sat, 5 Apr 2014 00:29:01 +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 1WWERK-0007SM-K7; Sat, 05 Apr 2014 00:26:32 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WWEQh-0002zM-6w; Sat, 05 Apr 2014 00:25:51 +0000 Received: from mail-qa0-x22e.google.com ([2607:f8b0:400d:c00::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WWEPb-0002nr-RP for linux-arm-kernel@lists.infradead.org; Sat, 05 Apr 2014 00:24:59 +0000 Received: by mail-qa0-f46.google.com with SMTP id i13so53141qae.33 for ; Fri, 04 Apr 2014 17:24:22 -0700 (PDT) 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=O4zSKsT5i/MYkKfyD+PtiGvFLL8Gb2dzHUoTSVIc7P4=; b=OIhUWCMA/zhN0ofw3DcvRNCVpoT0eU1ysazrIQSjC0fy0ojou40RL76jf/bgQq4EaW zcpmmqFN3vUzvwbbiSQCVZtzFFZ3vvkw5uTAelfwan6k1fIWVE3N8fUzxMTnZJ1tuz9j smxw7DkMoPrLHijxo1Ksy9JKuA7MsTMLp/kKGAorKN4tq8EK5x+UUwRr9d2H7LumZgsZ LumDXpq8vtbGDBJ364BAiFHw7td6kDFPyl4/3KkHsxMbkXkN/+whcpAYcynZsglGtH2O 2H1Lf1LNrnVuotLF1o8v+BR3GMr28NKHHQomDnfZd6FgdwHLmn760L3+HTKrkyWxQC7e tKRA== X-Received: by 10.224.54.4 with SMTP id o4mr18270956qag.74.1396657462417; Fri, 04 Apr 2014 17:24:22 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id i95sm13166816qge.5.2014.04.04.17.24.20 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 04 Apr 2014 17:24:21 -0700 (PDT) From: Soren Brinkmann To: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Randy Dunlap , Russell King , Michal Simek , Greg Kroah-Hartman , Jiri Slaby , Grant Likely Subject: [RESEND PATCH v3 9/9] ARM: zynq: DT: Migrate UART to Cadence binding Date: Fri, 4 Apr 2014 17:23:45 -0700 Message-Id: <1396657425-31029-9-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.9.1.1.gbb9f595 In-Reply-To: <1396657425-31029-1-git-send-email-soren.brinkmann@xilinx.com> References: <1396657425-31029-1-git-send-email-soren.brinkmann@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140404_202444_098650_06DC7A67 X-CRM114-Status: UNSURE ( 9.75 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: One Thousand Gnomes , Peter Crosthwaite , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@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.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 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 Tested-by: Michal Simek --- This change depends on 'tty: xuartps: Rebrand driver as Cadence UART', which introduces the new clock-names. Changes in v3: None Changes in v2: None Signed-off-by: Soren Brinkmann --- 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 789d0bacc110..d27eb5c21831 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -73,19 +73,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>; };