From patchwork Fri Jun 4 13:43:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Govindraj.R" X-Patchwork-Id: 104277 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o54DhmA9017502 for ; Fri, 4 Jun 2010 13:44:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755981Ab0FDNnq (ORCPT ); Fri, 4 Jun 2010 09:43:46 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:40542 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755765Ab0FDNnp (ORCPT ); Fri, 4 Jun 2010 09:43:45 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o54DhixO011629 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 4 Jun 2010 08:43:44 -0500 Received: from webmail.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o54DheSU004408; Fri, 4 Jun 2010 08:43:42 -0500 (CDT) Received: from 192.168.10.88 (proxying for 10.24.255.18) (SquirrelMail authenticated user x0100947); by dbdmail.itg.ti.com with HTTP; Fri, 4 Jun 2010 19:13:43 +0530 (IST) Message-ID: <53199.192.168.10.88.1275659023.squirrel@dbdmail.itg.ti.com> Date: Fri, 4 Jun 2010 19:13:43 +0530 (IST) Subject: [pm-wip/uart][PATCH 2/4] OMAP3: serial: Fix uart4 handling for 3630 From: "Govindraj.R" To: linux-omap@vger.kernel.org Cc: "Kevin Hilman" , "Sergio Aguirre" User-Agent: SquirrelMail/1.4.3a X-Mailer: SquirrelMail/1.4.3a MIME-Version: 1.0 X-Priority: 3 (Normal) Importance: Normal Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 04 Jun 2010 13:44:21 +0000 (UTC) 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; + omap_ctrl_writew(w, uart->padconf); +} + static void omap_uart_enable_wakeup(struct omap_uart_state *uart) { + /* Set appropriate muxmode */ + if (uart->muxmode && uart->padconf) + omap_uart_setmux_mode(uart); + /* Set wake-enable bit */ if (uart->wk_en && uart->wk_mask) { u32 v = __raw_readl(uart->wk_en); @@ -248,6 +262,10 @@ static void omap_uart_enable_wakeup(struct omap_uart_state *uart) static void omap_uart_disable_wakeup(struct omap_uart_state *uart) { + /* Set appropriate muxmode */ + if (uart->muxmode && uart->padconf) + omap_uart_setmux_mode(uart); + /* Clear wake-enable bit */ if (uart->wk_en && uart->wk_mask) { u32 v = __raw_readl(uart->wk_en); @@ -338,6 +356,9 @@ void omap_uart_resume_idle(int num) if (num == uart->num) { omap_uart_enable_clocks(uart); + if (uart->muxmode && uart->padconf) + omap_uart_setmux_mode(uart); + /* Check for IO pad wakeup */ if (cpu_is_omap34xx() && uart->padconf) { u16 p = omap_ctrl_readw(uart->padconf); @@ -416,9 +437,10 @@ 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; + u16 muxmode = 0; uart->wk_en = OMAP34XX_PRM_REGADDR(mod, PM_WKEN1); uart->wk_st = OMAP34XX_PRM_REGADDR(mod, PM_WKST1); @@ -435,9 +457,15 @@ 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; + muxmode = OMAP_MUX_MODE2; + break; } uart->wk_mask = wk_mask; uart->padconf = padconf; + uart->muxmode = muxmode; } else if (cpu_is_omap24xx()) { u32 wk_mask = 0;