From patchwork Thu Mar 10 09:32:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kalle.jokiniemi@nokia.com X-Patchwork-Id: 623921 X-Patchwork-Delegate: paul@pwsan.com 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 p2A9Yfra011524 for ; Thu, 10 Mar 2011 09:34:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752341Ab1CJJek (ORCPT ); Thu, 10 Mar 2011 04:34:40 -0500 Received: from smtp.nokia.com ([147.243.128.26]:17650 "EHLO mgw-da02.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752210Ab1CJJej (ORCPT ); Thu, 10 Mar 2011 04:34:39 -0500 Received: from nokia.com (localhost [127.0.0.1]) by mgw-da02.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id p2A9Yaes028849; Thu, 10 Mar 2011 11:34:36 +0200 Received: from kalle-t43.nmp.nokia.com ([trdhcp215135.nmp.nokia.com [172.22.215.135]]) by mgw-da02.nokia.com with RELAY id p2A9Y9o7028310 ; Thu, 10 Mar 2011 11:34:17 +0200 From: Kalle Jokiniemi To: paul@pwsan.com, khilman@ti.com, linux-omap@vger.kernel.org Cc: ilkka.koskinen@nokia.com, jhnikula@gmail.com, b-cousson@ti.com, Kalle Jokiniemi Subject: [PATCH 2/2] OMAP3: wdtimer: Disable SMART idle mode Date: Thu, 10 Mar 2011 11:32:49 +0200 Message-Id: <1299749569-22673-3-git-send-email-kalle.jokiniemi@nokia.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1299749569-22673-1-git-send-email-kalle.jokiniemi@nokia.com> References: <1299749569-22673-1-git-send-email-kalle.jokiniemi@nokia.com> X-Nokia-AV: Clean 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]); Thu, 10 Mar 2011 09:34:44 +0000 (UTC) diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 196a834..0be56bd 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -1240,7 +1240,10 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__wd_timer2 = { /* * 'wd_timer' class * 32-bit watchdog upward counter that generates a pulse on the reset pin on - * overflow condition + * overflow condition. + * + * Disallow SIDLE_SMART to use SIDLE_FORCE instead as the CORE power domain + * sleep transitions only work when wdtimer2 is in SIDLE_FORCE mode. */ static struct omap_hwmod_class_sysconfig omap3xxx_wd_timer_sysc = { @@ -1250,7 +1253,7 @@ static struct omap_hwmod_class_sysconfig omap3xxx_wd_timer_sysc = { .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_EMUFREE | SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY), - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), + .idlemodes = (SIDLE_FORCE | SIDLE_NO), /* SIDLE_SMART disabled */ .sysc_fields = &omap_hwmod_sysc_type1, };