From patchwork Wed Mar 21 16:48:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob X-Patchwork-Id: 7389 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id CA72823E0E for ; Wed, 21 Mar 2012 16:48:29 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8A86AA1829E for ; Wed, 21 Mar 2012 16:48:29 +0000 (UTC) Received: by iage36 with SMTP id e36so2399304iag.11 for ; Wed, 21 Mar 2012 09:48:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=PoJ/M7QY0AoG6aJUsrUqb0sEHtwzss2VHBLxclJx7qM=; b=PYX9MDvzdkAgE4c+DVNPsTkO3/NK3pbyqxHAu4s7pjr9RP01UazaF6IgwMC4ICaEHl plDPS+F6j97AjtHFvNgkd53RknR6O6LI5j6gvP6eYkn0TqBN8UqqwvaewS40GBaBcygW kjDwC9bC0Jdr+Slb20qplGrcBG8O+yPExRyGg7uJGtNV60xurZvto4HlXnXufXg7Xen4 ekmFGkc42rS9YxDlbWSvcwx8LzX3MEIFfPCVcyPjjTo4qX/AUFjA8SFyhRPjoh0HNkhC mlcrHFugfTcsEx9wXQjJdtm4GzCn826Bu9TGkK3Izqp5XCI1pA+r4+yttBeOT0hwEL6A Zpcw== Received: by 10.50.156.226 with SMTP id wh2mr3372285igb.2.1332348508921; Wed, 21 Mar 2012 09:48:28 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.203.79 with SMTP id fh15csp19374ibb; Wed, 21 Mar 2012 09:48:28 -0700 (PDT) Received: by 10.182.86.200 with SMTP id r8mr5701000obz.20.1332348507740; Wed, 21 Mar 2012 09:48:27 -0700 (PDT) Received: from mail-ob0-f178.google.com (mail-ob0-f178.google.com [209.85.214.178]) by mx.google.com with ESMTPS id jh10si1443789obc.70.2012.03.21.09.48.27 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Mar 2012 09:48:27 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.178 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) client-ip=209.85.214.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.178 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) smtp.mail=rob.lee@linaro.org Received: by obbuo19 with SMTP id uo19so1073203obb.37 for ; Wed, 21 Mar 2012 09:48:27 -0700 (PDT) Received: by 10.182.160.105 with SMTP id xj9mr633486obb.73.1332348507500; Wed, 21 Mar 2012 09:48:27 -0700 (PDT) Received: from localhost.localdomain (cpe-70-112-59-251.austin.res.rr.com. [70.112.59.251]) by mx.google.com with ESMTPS id b6sm2059632obe.12.2012.03.21.09.48.26 (version=SSLv3 cipher=OTHER); Wed, 21 Mar 2012 09:48:26 -0700 (PDT) From: Robert Lee To: len.brown@intel.com, nsekhar@ti.com Cc: khilman@ti.com, amit.kucheria@linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-dev@lists.linaro.org, patches@linaro.org Subject: [PATCH] ARM: davinci: Fix for cpuidle consolidation changes Date: Wed, 21 Mar 2012 11:48:25 -0500 Message-Id: <1332348505-28780-1-git-send-email-rob.lee@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQmHNTkBJpn50MZ24Jd78cYy8YwIf+gp9HNvf+0j1oau8CWnH1VHT5H+iS0v98tbFiUEj1X1 The recent cpuidle consolidation changes erroneously omitted one critical line of code. Signed-off-by: Robert Lee Acked-by: Sekhar Nori --- arch/arm/mach-davinci/cpuidle.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c index 93ae096..9107691 100644 --- a/arch/arm/mach-davinci/cpuidle.c +++ b/arch/arm/mach-davinci/cpuidle.c @@ -55,10 +55,11 @@ static int davinci_enter_idle(struct cpuidle_device *dev, #define DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN BIT(0) static struct cpuidle_driver davinci_idle_driver = { - .name = "cpuidle-davinci", - .owner = THIS_MODULE, - .states[0] = ARM_CPUIDLE_WFI_STATE, - .states[1] = { + .name = "cpuidle-davinci", + .owner = THIS_MODULE, + .en_core_tk_irqen = 1, + .states[0] = ARM_CPUIDLE_WFI_STATE, + .states[1] = { .enter = davinci_enter_idle, .exit_latency = 10, .target_residency = 100000,