[PATCH PM-20081119] OMAP: PM: Check both, IOPAD and UART wakeup always

[PATCH PM-20081119] OMAP: PM: Check both, IOPAD and UART wakeup always

[Jouni Hogander]

Uart RX might not always generate IOPAD wake-up. E.g. IOPAD is not
enabled or core was not in sleep state.

Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
---
 arch/arm/mach-omap2/serial.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 745ae5c..8d2f0b1 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -281,7 +281,7 @@ void omap_uart_resume_idle(int num)
 			}
 
 			/* Check for normal UART wakeup */
-			else if (__raw_readl(uart->wk_st) & uart->wk_mask)
+			if (__raw_readl(uart->wk_st) & uart->wk_mask)
 				omap_uart_block_sleep(uart);
 
 			return;
-- 
1.6.0.1

Re: [PATCH PM-20081119] OMAP: PM: Check both, IOPAD and UART wakeup always

[Kevin Hilman]

Jouni Hogander <jouni.hogander@nokia.com> writes:

> Uart RX might not always generate IOPAD wake-up. E.g. IOPAD is not
> enabled or core was not in sleep state.
>
> Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>

Thanks, applying to pm-20081119.

Kevin

>  arch/arm/mach-omap2/serial.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
> index 745ae5c..8d2f0b1 100644
> --- a/arch/arm/mach-omap2/serial.c
> +++ b/arch/arm/mach-omap2/serial.c
> @@ -281,7 +281,7 @@ void omap_uart_resume_idle(int num)
>  			}
>  
>  			/* Check for normal UART wakeup */
> -			else if (__raw_readl(uart->wk_st) & uart->wk_mask)
> +			if (__raw_readl(uart->wk_st) & uart->wk_mask)
>  				omap_uart_block_sleep(uart);
>  
>  			return;
> -- 
> 1.6.0.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html