From patchwork Mon Jan 24 15:51:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 501211 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0OJh2Xo026265 for ; Mon, 24 Jan 2011 19:46:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753364Ab1AXPvt (ORCPT ); Mon, 24 Jan 2011 10:51:49 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:51543 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753281Ab1AXPvr (ORCPT ); Mon, 24 Jan 2011 10:51:47 -0500 Received: by mail-fx0-f46.google.com with SMTP id 20so4155540fxm.19 for ; Mon, 24 Jan 2011 07:51:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=BbkIkOis4KYdoNDhfTgMSedDdFrzcVsINv3Xj0jp++4=; b=eipPAzGtvZq5Qfhw1MGA5ulKLZOYrNzjD8PrYgYerxvDZxnAxgVloRi0sQxz2Kj21t 7vIajZgGVD+mwMtxXw9eoNIiUrGQdjt1Wu907i85bpCLg88g+gbVWZXN7dFQkCw0K1Mh /GoS94Uww7TDwpMjkSBl7hGp0r6FgZrDHYY7o= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=cFtU+l37KO81UykkdobmtizgcH6qOXclF+GriELbBOp6tbWnTnc623mqz6XDqftJbb l6wdJpc8SZdnIU9Aep7PgKd0t/6+fb+TQelSJF1x18dEc34gG5K+O7wmngJK2iJkSqX7 pkFL1kcdi6YzRTB2Eg6Oy5z+1D+K1pXftfIX0= Received: by 10.223.81.70 with SMTP id w6mr4437600fak.62.1295884296933; Mon, 24 Jan 2011 07:51:36 -0800 (PST) Received: from localhost ([194.136.136.46]) by mx.google.com with ESMTPS id a25sm4605001fak.20.2011.01.24.07.51.34 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 24 Jan 2011 07:51:35 -0800 (PST) From: Jarkko Nikula To: linux-omap@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Tony Lindgren , Jarkko Nikula , "Govindraj.R" Subject: [RFC] serial: omap-serial: Enable the UART wake-up bits always Date: Mon, 24 Jan 2011 17:51:22 +0200 Message-Id: <1295884282-16562-1-git-send-email-jhnikula@gmail.com> X-Mailer: git-send-email 1.7.0.4 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.6 (demeter1.kernel.org [140.211.167.41]); Mon, 24 Jan 2011 19:46:01 +0000 (UTC) diff --git a/drivers/serial/omap-serial.c b/drivers/serial/omap-serial.c index 7f2f010..d40924a 100644 --- a/drivers/serial/omap-serial.c +++ b/drivers/serial/omap-serial.c @@ -517,6 +517,9 @@ static int serial_omap_startup(struct uart_port *port) up->ier = UART_IER_RLSI | UART_IER_RDI; serial_out(up, UART_IER, up->ier); + /* Enable module level wake up */ + serial_out(up, UART_OMAP_WER, OMAP_UART_WER_MOD_WKUP); + up->port_activity = jiffies; return 0; } @@ -824,9 +827,6 @@ serial_omap_pm(struct uart_port *port, unsigned int state, serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); serial_out(up, UART_EFR, efr); serial_out(up, UART_LCR, 0); - /* Enable module level wake up */ - serial_out(up, UART_OMAP_WER, - (state != 0) ? OMAP_UART_WER_MOD_WKUP : 0); } static void serial_omap_release_port(struct uart_port *port)