linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: khilman@linaro.org (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.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	[thread overview]
Message-ID: <1370040357-25794-4-git-send-email-khilman@linaro.org> (raw)
In-Reply-To: <1370040357-25794-1-git-send-email-khilman@linaro.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 <khilman@linaro.org>
---
 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 */
+		>;
+	};
+};
-- 
1.8.2

  parent reply	other threads:[~2013-05-31 22:45 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-31 22:45 [PATCH 0/3] ARM: DTS: misc. OMAP3 fixes for proper wakeup Kevin Hilman
2013-05-31 22:45 ` [PATCH 1/3] ARM: DTS: OMAP3: beagle/overo: mux console UART, enable wakeup Kevin Hilman
2013-06-03  9:36   ` Florian Vaussard
2013-06-03 21:26     ` Kevin Hilman
2013-05-31 22:45 ` [PATCH 2/3] ARM: DTS: OMAP3: beagle: enable user button via gpio_keys, " Kevin Hilman
2013-06-03  9:40   ` Florian Vaussard
2013-05-31 22:45 ` Kevin Hilman [this message]
2013-06-03  9:48   ` [PATCH 3/3] ARM: DTS: TWL4030: fix mux and wakeup for SYS_NIRQ line Florian Vaussard
2013-06-03 22:19     ` Kevin Hilman
2013-06-03 22:39       ` Jason Cooper
2013-06-04 17:58         ` Kevin Hilman
2013-06-04 18:05           ` Jason Cooper
2013-06-05  7:41       ` Florian Vaussard
2013-06-05 13:52       ` Benoit Cousson
2013-06-05 14:26         ` Kevin Hilman
2013-06-06 23:27 ` [PATCH v2 " Kevin Hilman
2013-06-06 23:42   ` Nishanth Menon
2013-06-07 16:59     ` Kevin Hilman
2013-06-07 18:31 ` [PATCH v3] " Kevin Hilman
2013-06-07 19:31   ` Nishanth Menon
2013-06-10  9:22     ` Benoit Cousson
2013-06-10 16:40       ` Kevin Hilman
2013-06-11 11:33         ` Cousson, Benoit
2013-06-11 11:43           ` Benoit Cousson
2013-06-11 14:30             ` Kevin Hilman
2013-06-19  1:25               ` Benoit Cousson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1370040357-25794-4-git-send-email-khilman@linaro.org \
    --to=khilman@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).