From patchwork Mon Jul 11 23:29:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 966822 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6BNTZAi022522 for ; Mon, 11 Jul 2011 23:29:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758560Ab1GKX3q (ORCPT ); Mon, 11 Jul 2011 19:29:46 -0400 Received: from na3sys009aog121.obsmtp.com ([74.125.149.145]:46635 "EHLO na3sys009aog121.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758556Ab1GKX3q (ORCPT ); Mon, 11 Jul 2011 19:29:46 -0400 Received: from mail-iw0-f178.google.com ([209.85.214.178]) (using TLSv1) by na3sys009aob121.postini.com ([74.125.148.12]) with SMTP ID DSNKThuHaek2CYk1ApkxMHgjxaEx2Os/ldir@postini.com; Mon, 11 Jul 2011 16:29:45 PDT Received: by mail-iw0-f178.google.com with SMTP id 10so5756840iwc.23 for ; Mon, 11 Jul 2011 16:29:45 -0700 (PDT) Received: by 10.43.46.201 with SMTP id up9mr5387911icb.499.1310426985107; Mon, 11 Jul 2011 16:29:45 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net [24.19.7.36]) by mx.google.com with ESMTPS id fw9sm7987406ibb.30.2011.07.11.16.29.43 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Jul 2011 16:29:44 -0700 (PDT) From: Kevin Hilman To: "Rafael J. Wysocki" , Paul Walmsley , linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-pm@lists.linux-foundation.org Subject: [PATCH 4/4] OMAP: PM: disable idle on suspend for GPIO and UART Date: Mon, 11 Jul 2011 16:29:29 -0700 Message-Id: <1310426969-30306-5-git-send-email-khilman@ti.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1310426969-30306-1-git-send-email-khilman@ti.com> References: <1310426969-30306-1-git-send-email-khilman@ti.com> 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 (demeter2.kernel.org [140.211.167.43]); Mon, 11 Jul 2011 23:29:47 +0000 (UTC) Until these drivers are runtime PM converted, their device power states are managed by calling custom driver hooks late in the idle/suspend path. Therefore, do not let the suspend/resume core code automatically idle these devices since they will be managed manually by the OMAP PM core very late in the idle/suspend path. Signed-off-by: Kevin Hilman --- arch/arm/mach-omap2/gpio.c | 2 ++ arch/arm/mach-omap2/serial.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 9529842..48e5ece 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c @@ -87,6 +87,8 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) return PTR_ERR(od); } + omap_device_disable_idle_on_suspend(od); + gpio_bank_count++; return 0; } diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 1ac361b..466fc722 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -805,6 +805,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata) WARN(IS_ERR(od), "Could not build omap_device for %s: %s.\n", name, oh->name); + omap_device_disable_idle_on_suspend(od); oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); uart->irq = oh->mpu_irqs[0].irq;