On Fri, Jun 4, 2010 at 7:33 PM, Gopinath, Thara <th...@ti.com> wrote: > > >>>-----Original Message----- >>>From: linux-omap-ow...@vger.kernel.org >>>[mailto:linux-omap-ow...@vger.kernel.org] On Behalf Of >>>Govindraj.R >>>Sent: Friday, June 04, 2010 7:14 PM >>>To: linux-omap@vger.kernel.org >>>Cc: Kevin Hilman; Aguirre, Sergio >>>Subject: [pm-wip/uart][PATCH 2/4] 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. >>> - Muxmode usage needed for uart4 for 3630 for padconf >>> wakeup on rx line. >>> >>>Cc: Kevin Hilman <khil...@deeprootsystems.com> >>>Signed-off-by: Sergio Aguirre <saagui...@ti.com> >>>Signed-off-by: Govindraj.R <govindraj.r...@ti.com> >>>--- >>> arch/arm/mach-omap2/serial.c | 30 +++++++++++++++++++++++++++++- >>> 1 files changed, 29 insertions(+), 1 deletions(-) >>> >>>diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c >>>index da9fee6..70a9089 100644 >>>--- a/arch/arm/mach-omap2/serial.c >>>+++ b/arch/arm/mach-omap2/serial.c >>>@@ -42,6 +42,7 @@ >>> #include "prm.h" >>> #include "pm.h" >>> #include "cm.h" >>>+#include "mux.h" >>> #include "prm-regbits-34xx.h" >>> >>> #define UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV 0x52 >>>@@ -68,6 +69,7 @@ struct omap_uart_state { >>> u32 wk_mask; >>> u32 padconf; >>> u32 dma_enabled; >>>+ u16 muxmode; >>> >>> struct clk *ick; >>> struct clk *fck; >>>@@ -229,8 +231,20 @@ static inline void omap_uart_disable_clocks(struct >>>omap_uart_state *uart) >>> omap_device_idle(uart->pdev); >>> } >>> >>>+static inline void omap_uart_setmux_mode(struct omap_uart_state *uart) >>>+{ >>>+ u16 w = omap_ctrl_readw(uart->padconf); >>>+ w &= ~0x7; >>>+ w |= OMAP_MUX_MODE2; > > Why it is hard coded to MUX_MODE2? Should it not be w |= uart->muxmode? > > Regards > Thara
Yes correct it should been w |= uart->muxmode. --- Regards, Govindraj.R -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
