From b803bebb6cb683b5cd0678ae7c140377cb9e8135 Mon Sep 17 00:00:00 2001
From: "Govindraj.R" <govindraj.raja@ti.com>
Date: Mon, 27 Sep 2010 20:20:41 +0530
Subject: [PATCH] --- yaml --- r: 216979 b: refs/heads/master c:
 52663aea10c3ce175b636ff3ed5a6d78fdbeec02 h: refs/heads/master i:   216977:
 2aba11e3a465d3504f56d724e0642c7ce2981468   216975:
 57d21192adabffea0a40b91aa3c0e25f8dc29afe v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-omap2/serial.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e7985a51e53a..021964e9e99a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd4f1faee029593fc10039aeb592dc2986d55f61
+refs/heads/master: 52663aea10c3ce175b636ff3ed5a6d78fdbeec02
diff --git a/trunk/arch/arm/mach-omap2/serial.c b/trunk/arch/arm/mach-omap2/serial.c
index 72b5c9896390..0bcc9df0c034 100644
--- a/trunk/arch/arm/mach-omap2/serial.c
+++ b/trunk/arch/arm/mach-omap2/serial.c
@@ -487,7 +487,7 @@ static void omap_uart_idle_init(struct omap_uart_state *uart)
 	omap_uart_smart_idle_enable(uart, 0);
 
 	if (cpu_is_omap34xx()) {
-		u32 mod = (uart->num == 2) ? OMAP3430_PER_MOD : CORE_MOD;
+		u32 mod = (uart->num > 1) ? OMAP3430_PER_MOD : CORE_MOD;
 		u32 wk_mask = 0;
 		u32 padconf = 0;
 
@@ -506,6 +506,10 @@ static void omap_uart_idle_init(struct omap_uart_state *uart)
 			wk_mask = OMAP3430_ST_UART3_MASK;
 			padconf = 0x19e;
 			break;
+		case 3:
+			wk_mask = OMAP3630_ST_UART4_MASK;
+			padconf = 0x0d2;
+			break;
 		}
 		uart->wk_mask = wk_mask;
 		uart->padconf = padconf;