Skip to contentSkip to conversation

OMAP: UART: don't resume UARTs that are not enabled.

PATCH New Kevin Hilman 3 participants 3 messages Nov 24, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 OMAP: UART: don't resume UARTs that are not enabled.

Add additional check to omap_uart_resume_idle() so that only enabled (specfically, idle-enabled) UARTs are allowed to resume. This matches the existing check in prepare idle.

---
Unless there are any objections, this will be queued in pm-next for 2.6.38.

 arch/arm/mach-omap2/serial.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/serial.c +1 -1
index becf0e3..bc934db 100644
@@ -406,7 +406,7 @@ void omap_uart_resume_idle(int num)
 	struct omap_uart_state *uart;
 
 	list_for_each_entry(uart, &uart_list, node) {
-		if (num == uart->num) {
+		if (num == uart->num && uart->can_sleep) {
 			omap_uart_enable_clocks(uart);
 
 			/* Check for IO pad wakeup */
Signature · 1 line
1.7.2.1
#1 lore raw

PATCH 1/1 OMAP: UART: don't resume UARTs that are not enabled.

Hi,

Quoted 2 lines · Kevin Hilman

Add additional check to omap_uart_resume_idle() so that only enabled (specfically, idle-enabled) UARTs are allowed to resume.

typo: specifically

Signature · 1 line
balbi
maintainer
#2 lore raw

PATCH 1/1 OMAP: UART: don't resume UARTs that are not enabled.

Quoted 7 lines · Felipe Balbi

Hi,

Quoted 2 lines · Kevin Hilman

Add additional check to omap_uart_resume_idle() so that only enabled (specfically, idle-enabled) UARTs are allowed to resume.

typo: specifically

Also, without this patch, system with PM enabled hangs in cases where only one serial port is initialized instead of all of them. So I'll queue it as a fix during the -rc cycle.

Regards,

Tony