From patchwork Tue Jun 29 06:58:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Reddy, Teerth" X-Patchwork-Id: 108511 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5T6xGYM012133 for ; Tue, 29 Jun 2010 06:59:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752869Ab0F2G7H (ORCPT ); Tue, 29 Jun 2010 02:59:07 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:51988 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752097Ab0F2G7F convert rfc822-to-8bit (ORCPT ); Tue, 29 Jun 2010 02:59:05 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o5T6wxBk030613 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 29 Jun 2010 01:59:02 -0500 Received: from dbde71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id o5T6wv7E002819; Tue, 29 Jun 2010 12:28:58 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde71.ent.ti.com ([172.24.170.149]) with mapi; Tue, 29 Jun 2010 12:28:57 +0530 From: "Reddy, Teerth" To: "linux-omap@vger.kernel.org" CC: Kevin Hilman Date: Tue, 29 Jun 2010 12:28:56 +0530 Subject: [PATCH 1/3] OMAP3:PM: Keep UART clocks disabled is resume idle path Thread-Topic: [PATCH 1/3] OMAP3:PM: Keep UART clocks disabled is resume idle path Thread-Index: AcsXWIr7rId6HLPgSFW1kSkmTiSvQA== Message-ID: <5A47E75E594F054BAF48C5E4FC4B92AB0323763481@dbde02.ent.ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 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]); Tue, 29 Jun 2010 06:59:16 +0000 (UTC) diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 3771254..d545eed 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -343,6 +343,7 @@ static void omap_uart_idle_timer(unsigned long data) { struct omap_uart_state *uart = (struct omap_uart_state *)data; + uart->timeout = DEFAULT_TIMEOUT; omap_uart_allow_sleep(uart); } @@ -364,7 +365,6 @@ void omap_uart_resume_idle(int num) list_for_each_entry(uart, &uart_list, node) { if (num == uart->num) { - omap_uart_enable_clocks(uart); /* Check for IO pad wakeup */ if (cpu_is_omap34xx() && uart->padconf) { @@ -436,7 +436,7 @@ static void omap_uart_idle_init(struct omap_uart_state *uart) int ret; uart->can_sleep = 0; - uart->timeout = DEFAULT_TIMEOUT; + uart->timeout = 30 * HZ; setup_timer(&uart->timer, omap_uart_idle_timer, (unsigned long) uart); if (uart->timeout)