From: khilman@linaro.org (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] ARM: DTS: OMAP3: beagle/overo: mux console UART, enable wakeup
Date: Fri, 31 May 2013 15:45:55 -0700 [thread overview]
Message-ID: <1370040357-25794-2-git-send-email-khilman@linaro.org> (raw)
In-Reply-To: <1370040357-25794-1-git-send-email-khilman@linaro.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 <khilman@linaro.org>
---
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>;
+};
--
1.8.2
next prev 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 ` Kevin Hilman [this message]
2013-06-03 9:36 ` [PATCH 1/3] ARM: DTS: OMAP3: beagle/overo: mux console UART, enable wakeup 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 ` [PATCH 3/3] ARM: DTS: TWL4030: fix mux and wakeup for SYS_NIRQ line Kevin Hilman
2013-06-03 9:48 ` 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-2-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).