From patchwork Fri Apr 4 07:47:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 3936821 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B2210C0DA2 for ; Fri, 4 Apr 2014 07:47:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0109A203E3 for ; Fri, 4 Apr 2014 07:47:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C906203E1 for ; Fri, 4 Apr 2014 07:47:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752122AbaDDHr5 (ORCPT ); Fri, 4 Apr 2014 03:47:57 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:33907 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752101AbaDDHr4 (ORCPT ); Fri, 4 Apr 2014 03:47:56 -0400 Received: by mail-wi0-f174.google.com with SMTP id d1so691047wiv.7 for ; Fri, 04 Apr 2014 00:47:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4zwmVLX1J7OW3WPOkE9jC5IAAJcnC6NyJD+Rccw16sQ=; b=nKjoPs8u0NP6SIojdl7HtVb/nla/qN3E4hpbWuxzGyNeKp5MOPe11zwyf75kusLaY7 E9x1u1n9TPWBG0W5RIQnBkuO8OGqfbbXNT3b+TwiczgLlYaNnXNEFzWIDls25r5HND58 p1m2HOuBj3bJrtjgZTF8cJ2AvD1GPbsqp8AM0izjYh8BKfZTNWmsYsKm/ZuS3QI3Ev+M IjLz4L8OCs+Oi/pd0cwMmzTMX+inSeBuPOQ6o+XxfkygHGvCCYpO/M3Agen0fmFTcY22 LxsnOxPZY7hshpIwvJc5SNApInhnOpC9XU53uHR0MxIZ6lzg3aKVshlLa4+Ay0Vz3YKm 2VlQ== X-Gm-Message-State: ALoCoQkJNh1dkXBJ4Qf6wlY2rte46/Yf+KOX4mlIcDidwIl0oy+slUm1RIDuRLX1q/l7M6I5fZ4g X-Received: by 10.180.189.139 with SMTP id gi11mr2112504wic.53.1396597675407; Fri, 04 Apr 2014 00:47:55 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-451-172.w83-205.abo.wanadoo.fr. [83.205.74.172]) by mx.google.com with ESMTPSA id t1sm3028163wia.1.2014.04.04.00.47.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Apr 2014 00:47:54 -0700 (PDT) From: Daniel Lezcano To: kgene.kim@samsung.com Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, t.figa@samsung.com, linaro-kernel@lists.linaro.org, rjw@rjwysocki.net Subject: [PATCH 06/17] ARM: exynos: cpuidle: Fix S5P_WAKEUP_STAT call Date: Fri, 4 Apr 2014 09:47:52 +0200 Message-Id: <1396597683-6969-7-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396597683-6969-1-git-send-email-daniel.lezcano@linaro.org> References: <1396597683-6969-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This function should be called only when the powerdown sequence fails. Even if the current code does not hurt, by moving this line, we have the same code than the one in pm.c. Signed-off-by: Daniel Lezcano Reviewed-by: Viresh Kumar --- arch/arm/mach-exynos/cpuidle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 9cd1ed9..a1e1882 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -135,11 +135,10 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, if (!(tmp & S5P_CENTRAL_LOWPWR_CFG)) { tmp |= S5P_CENTRAL_LOWPWR_CFG; __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION); + /* Clear wakeup state register */ + __raw_writel(0x0, S5P_WAKEUP_STAT); } - /* Clear wakeup state register */ - __raw_writel(0x0, S5P_WAKEUP_STAT); - return index; }