From patchwork Fri May 31 22:45:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 2646131 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 5C231DFB79 for ; Fri, 31 May 2013 22:48:23 +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 1UiY6I-0005p0-SF; Fri, 31 May 2013 22:47:12 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiY5z-0004tD-Ny; Fri, 31 May 2013 22:46:51 +0000 Received: from mail-pb0-x233.google.com ([2607:f8b0:400e:c01::233]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiY5d-0004qt-KB for linux-arm-kernel@lists.infradead.org; Fri, 31 May 2013 22:46:30 +0000 Received: by mail-pb0-f51.google.com with SMTP id jt11so2926383pbb.10 for ; Fri, 31 May 2013 15:46:08 -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=nZ0jwfRtwPMX0z4BC4X2Js8r68IoSKbq4n99pk2sFJA=; b=H0cWpf0VrAixlkkXHwCti48qRM/9UzNrVHnbmwRH+x2yZAjd0YWx9luhiU3a1uLA8Q 4eTL7TLDqIUZiKzdizzz/kFlJxzBHG5zh8BeECb+xdcGYGECcpCUzdEXP9a5Hj+e2ZLB 0bczKidA3F90Uc7pb4B3TDF2bVQfD20T/58K2qNCDile17j3UapgSa9MxqV9WpaXU489 VSLd9B+42sZ0xVcNcuWcm2hf64e+l+l0VjQW61tkCuBpkB112oG7cNbvVbrq6AQ3vWc8 BquZI2srglTIMBbUK6lgWXB52t2J/OZgcZxEbC+ysU+Kht9c4TbZv1fO/llIUHA67Xv/ rSkQ== X-Received: by 10.66.155.138 with SMTP id vw10mr15464098pab.91.1370040368018; Fri, 31 May 2013 15:46:08 -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 j10sm48373636pbh.23.2013.05.31.15.46.06 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 31 May 2013 15:46:07 -0700 (PDT) From: Kevin Hilman To: Benoit Cousson , linux-omap@vger.kernel.org Subject: [PATCH 3/3] ARM: DTS: TWL4030: fix mux and wakeup for SYS_NIRQ line Date: Fri, 31 May 2013 15:45:57 -0700 Message-Id: <1370040357-25794-4-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: ALoCoQnR+0+pMs0WsDW/NAA9Y1I1vvFtsSIkeihU8763PYuRh5tJgGvzLem4ZcnGDvuoRjaE5zaK X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130531_184629_817632_5BC311AD X-CRM114-Status: GOOD ( 11.83 ) 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 On most OMAP3 platforms, the twl4030 IRQ line is connected to the SYS_NIRQ line on OMAP. Therefore, configure the defaults for the SYS_NIRQ pin in the twl4030 DTS file. Boards that hook up the twl4030 differently can easily override this in their board-specific DTS file. This allows RTC wake from off-mode to work again on OMAP3-based platforms with twl4030. Tested on 3530/Beagle, 3730/Beagle-xM, 3530/Overo, 3730/Overo-STORM. Signed-off-by: Kevin Hilman --- arch/arm/boot/dts/twl4030.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi index b3034da..c7fe9f6 100644 --- a/arch/arm/boot/dts/twl4030.dtsi +++ b/arch/arm/boot/dts/twl4030.dtsi @@ -13,6 +13,8 @@ compatible = "ti,twl4030"; interrupt-controller; #interrupt-cells = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&twl4030_pins>; rtc { compatible = "ti,twl4030-rtc"; @@ -92,3 +94,18 @@ #pwm-cells = <2>; }; }; + +&omap3_pmx_core { + /* + * On most OMAP3 platforms, the twl4030 IRQ line is connected + * to the SYS_NIRQ line on OMAP. Therefore, configure the + * defaults for the SYS_NIRQ pin here. Boards that hook up + * the twl4030 differently can easily override this in their + * board-specific DTS file. + */ + twl4030_pins: pinmux_twl4030_pins { + pinctrl-single,pins = < + 0x1b0 0x4118 /* sys_nirq.sys_nirq WAKEUP | INPUT_PULLUP | MODE 0 */ + >; + }; +};