FIXME: there needs to be a platform specific way to set which padconf regs are actually used, as the current ones are specific to 3430SDP. Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> --- arch/arm/mach-omap2/serial.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index c189cc9..96e3165 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -298,6 +298,15 @@ void __init omap_serial_init(void) v = __raw_readl(omap_uart_wk_en[i]); v |= omap_uart_wk_bit[i]; __raw_writel(v, omap_uart_wk_en[i]); + + /* Ensure PADCONF wake-enables are set */ + if (cpu_is_omap34xx() && omap34xx_uart_padconf[i]) { + u16 w; + + w = omap_ctrl_readw(omap34xx_uart_padconf[i]); + w |= 0x4000; + omap_ctrl_writew(w, omap34xx_uart_padconf[i]); + } } omap_serial_kick(); -- 1.6.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html