From patchwork Thu Jun 13 16:37:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 2717881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 19BEF9F3DD for ; Thu, 13 Jun 2013 16:39:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E5182046F for ; Thu, 13 Jun 2013 16:39:54 +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 C07FC2046D for ; Thu, 13 Jun 2013 16:39:52 +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 1UnAXp-0004Eq-Gt; Thu, 13 Jun 2013 16:38:42 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnAXc-0000sC-FB; Thu, 13 Jun 2013 16:38:28 +0000 Received: from mail-pa0-x22c.google.com ([2607:f8b0:400e:c03::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnAXG-0000pO-HZ for linux-arm-kernel@lists.infradead.org; Thu, 13 Jun 2013 16:38:11 +0000 Received: by mail-pa0-f44.google.com with SMTP id lj1so5100657pab.17 for ; Thu, 13 Jun 2013 09:37:45 -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:x-mailer:in-reply-to :references; bh=nub4CvcS2VUbY5/6F3ntbMIsjyeT99fFfA86/aes028=; b=vQYMTbwWJ0pQTTCatDrPiVKXLdG4HwciG9BW9kWeV2qebZ5ftE8hWD8EsG4foaV/jn 8Zu48Kk12MO7FCm4AvRtvqG+Ry9E0gzkPGeD9oizwzp4s2WnQRWoQpQ1MOa6cHZiTMXD rY48RHCYY1Mgij9uKjRHY25ZuXXvBX/ceQhgf8g/N44SZvT3TncOGf5CUpJDcHN/lYoB OkkoKqjmQXwLFMo9FBV+R9unfQYIZh4oWXV4UDqZPALzRWhHJ2c/HwL75WtmaCJMVUkP i0foe45NkX+9yOXSIpXv7PUi/3cWYbMbaynML2Lkx1NnM9Lkyzh2igRrWNx0HB7lRXgF BY4g== X-Received: by 10.68.164.226 with SMTP id yt2mr1560615pbb.203.1371141465045; Thu, 13 Jun 2013 09:37:45 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id xj9sm17545105pbc.16.2013.06.13.09.37.43 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 13 Jun 2013 09:37:44 -0700 (PDT) From: Soren Brinkmann To: Michal Simek , Russell King , Steffen Trumtrar Subject: [PATCH v3 2/4] arm: dt: zynq: Use 'status' property for UART nodes Date: Thu, 13 Jun 2013 09:37:16 -0700 Message-Id: <1371141438-16553-3-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1371141438-16553-1-git-send-email-soren.brinkmann@xilinx.com> References: <1371141438-16553-1-git-send-email-soren.brinkmann@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130613_123806_683918_A3A30339 X-CRM114-Status: GOOD ( 10.84 ) X-Spam-Score: -1.9 (-) Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Dinh Nguyen , Olof Johansson , Shawn Guo , 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.5 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 Set the default status for UARTs to disabled in the zynq-7000.dtsi file and let board dts files enable the UARTs on demand. Signed-off-by: Soren Brinkmann --- arch/arm/boot/dts/zynq-7000.dtsi | 2 ++ arch/arm/boot/dts/zynq-zc702.dts | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index 0dbee2c..6f54a64 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -49,6 +49,7 @@ uart0: uart@e0000000 { compatible = "xlnx,xuartps"; + status = "disabled"; clocks = <&clkc 23>, <&clkc 40>; clock-names = "ref_clk", "aper_clk"; reg = <0xE0000000 0x1000>; @@ -57,6 +58,7 @@ uart1: uart@e0001000 { compatible = "xlnx,xuartps"; + status = "disabled"; clocks = <&clkc 24>, <&clkc 41>; clock-names = "ref_clk", "aper_clk"; reg = <0xE0001000 0x1000>; diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index e25a307..21aea99 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -24,7 +24,11 @@ }; chosen { - bootargs = "console=ttyPS1,115200 earlyprintk"; + bootargs = "console=ttyPS0,115200 earlyprintk"; }; }; + +&uart1 { + status = "okay"; +};