Skip to contentSkip to conversation

OMAP3: serial: Fix uart4 handling for 3630

PATCH Superseded Govindraj.R 3 participants 3 messages Sep 22, 2010 – Sep 23, 2010

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 10/13 OMAP3: serial: Fix uart4 handling for 3630

This patch makes the following:
- Adds missing wakeup padding register handling.
- Fixes a hardcode to use PER module ONLY on UART3.

---
 arch/arm/mach-omap2/serial.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/serial.c +6 -2
index 72b5c98..c1404af 100644
@@ -57,7 +57,7 @@
  * disabled via sysfs. This also causes that any deeper omap sleep states are
  * blocked.
  */
-#define DEFAULT_TIMEOUT 0
+#define DEFAULT_TIMEOUT 5
 
 #define MAX_UART_HWMOD_NAME_LEN		16
 
@@ -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;
Signature · 1 line
1.6.3.3
#1 lore raw

PATCH v2 10/13 OMAP3: serial: Fix uart4 handling for 3630

Quoted 16 lines · Govindraj.R

This patch makes the following:
- Adds missing wakeup padding register handling.
- Fixes a hardcode to use PER module ONLY on UART3.

---
 arch/arm/mach-omap2/serial.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/serial.c +0 -0
index 72b5c98..c1404af 100644

arch/arm/mach-omap2/serial.c line 60

Quoted 5 lines
arch/arm/mach-omap2/serial.c +1 -1
@@ -57,7 +57,7 @@
  * disabled via sysfs. This also causes that any deeper omap sleep states are
  * blocked.
  */
-#define DEFAULT_TIMEOUT 0
+#define DEFAULT_TIMEOUT 5

Oops

Please leave this at zero.

Kevin

#2 lore raw

PATCH v2 10/13 OMAP3: serial: Fix uart4 handling for 3630

Quoted 26 lines · Kevin Hilman
Quoted 19 lines · Govindraj.R

This patch makes the following:
?- Adds missing wakeup padding register handling. ?- Fixes a hardcode to use PER module ONLY on UART3.

---
?arch/arm/mach-omap2/serial.c | ? ?8 ++++++--
?1 files changed, 6 insertions(+), 2 deletions(-)

arch/arm/mach-omap2/serial.c +0 -0
index 72b5c98..c1404af 100644
@@ -57,7 +57,7 @@

? * disabled via sysfs. This also causes that any deeper omap sleep states are ? * blocked.
? */

arch/arm/mach-omap2/serial.c line 60

Quoted 2 lines
arch/arm/mach-omap2/serial.c +1 -1
-#define DEFAULT_TIMEOUT 0
+#define DEFAULT_TIMEOUT 5

Oops

Quoted 1 line

Please leave this at zero.

Yes my mistake.
Will correct this.

Quoted 7 lines

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html

Signature · 3 lines
---
Regards,
Govindraj.R