From patchwork Fri May 31 22:45:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 2646121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 188B53FD4E for ; Fri, 31 May 2013 22:47:17 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiY5v-0005jo-6d; Fri, 31 May 2013 22:46:47 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiY5m-0004sm-0V; Fri, 31 May 2013 22:46:38 +0000 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiY5Y-0004qX-It for linux-arm-kernel@lists.infradead.org; Fri, 31 May 2013 22:46:25 +0000 Received: by mail-pa0-f46.google.com with SMTP id fa1so255722pad.33 for ; Fri, 31 May 2013 15:46:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Pyahrf3N8/c6Ge9Y6L95p35sVXy80TPbxRrxgh+6s/A=; b=LRhEvmxWqep5cJh0vIBZkngwkBRkpRc0nEcVIVWfsJQ10HuPw1pntCr3o1S+Uhebow bNb9sQTOrPYfXFVHiACk2BFePDO2TuDiOMhmsWYgyG3KDhJAk/YlRftV7ln4VJC0rosJ Wg7D+KKRrve/V2nIJRoAsXtfqqZAEAE8Ip1+GMH7+gbg9MzbQLPTpy0MbRdcm1IlOMwC JwXHjFN33qdPpA0CEXT54N02gxAZ/Gn3Mh003hgokFi27ahPPICJUp/2+VVCPVl6rwWJ 6Z60G/rHriexfPzJe624ebg3qhQv/W+b8PxfdbfsqUd65jzHsoYW23pIdhwxiHUrnpkL 0q9w== X-Received: by 10.66.17.137 with SMTP id o9mr7636374pad.142.1370040363027; Fri, 31 May 2013 15:46:03 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPSA id kv2sm48362701pbc.28.2013.05.31.15.46.01 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 31 May 2013 15:46:02 -0700 (PDT) From: Kevin Hilman To: Benoit Cousson , linux-omap@vger.kernel.org Subject: [PATCH 1/3] ARM: DTS: OMAP3: beagle/overo: mux console UART, enable wakeup Date: Fri, 31 May 2013 15:45:55 -0700 Message-Id: <1370040357-25794-2-git-send-email-khilman@linaro.org> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1370040357-25794-1-git-send-email-khilman@linaro.org> References: <1370040357-25794-1-git-send-email-khilman@linaro.org> X-Gm-Message-State: ALoCoQnbQwicLUIIRZLXoY5P5W0/QUAakuVAvHhtw/T8cbOB3HJuCNtrt5Obojn5PouACYOccfhZ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130531_184624_721416_4C9F217D X-CRM114-Status: UNSURE ( 9.22 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Ensure the console uart (UART3) on these boards is mux'd correctly, and IO ring wakeup is enabled. This is needed for serial console wakeups when using DT boot. Signed-off-by: Kevin Hilman --- arch/arm/boot/dts/omap3-beagle-xm.dts | 14 ++++++++++++++ arch/arm/boot/dts/omap3-beagle.dts | 12 ++++++++++++ arch/arm/boot/dts/omap3-overo.dtsi | 14 ++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts index 3046d1f..ca067b0 100644 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts @@ -126,3 +126,17 @@ mode = <3>; power = <50>; }; + +&omap3_pmx_core { + uart3_pins: pinmux_uart3_pins { + pinctrl-single,pins = < + 0x16e 0x4100 /* uart3_rx_irrx.uart3_rx_irrx WAKEUP | INPUT | MODE0 */ + 0x170 0x0 /* uart3_tx_irtx.uart3_tx_irtx OUTPUT | MODE0 */ + >; + }; +}; + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&uart3_pins>; +}; diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index 6eec699..b004372 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts @@ -95,6 +95,13 @@ 0x1ae 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat7 INPUT | PULLDOWN */ >; }; + + uart3_pins: pinmux_uart3_pins { + pinctrl-single,pins = < + 0x16e 0x4100 /* uart3_rx_irrx.uart3_rx_irrx WAKEUP | INPUT | MODE0 */ + 0x170 0x0 /* uart3_tx_irtx.uart3_tx_irtx OUTPUT | MODE0 */ + >; + }; }; &i2c1 { @@ -142,3 +149,8 @@ */ ti,pulldowns = <0x03a1c4>; }; + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&uart3_pins>; +}; diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi index a626c50..d63ed39 100644 --- a/arch/arm/boot/dts/omap3-overo.dtsi +++ b/arch/arm/boot/dts/omap3-overo.dtsi @@ -77,3 +77,17 @@ mode = <3>; power = <50>; }; + +&omap3_pmx_core { + uart3_pins: pinmux_uart3_pins { + pinctrl-single,pins = < + 0x16e 0x4100 /* uart3_rx_irrx.uart3_rx_irrx WAKEUP | INPUT | MODE0 */ + 0x170 0x0 /* uart3_tx_irtx.uart3_tx_irtx OUTPUT | MODE0 */ + >; + }; +}; + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&uart3_pins>; +};