From patchwork Fri Apr 4 07:47:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 3936841 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AED689F3FF for ; Fri, 4 Apr 2014 07:48:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CB443203E5 for ; Fri, 4 Apr 2014 07:48:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3E95203E3 for ; Fri, 4 Apr 2014 07:47:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752127AbaDDHr7 (ORCPT ); Fri, 4 Apr 2014 03:47:59 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:51957 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750755AbaDDHr7 (ORCPT ); Fri, 4 Apr 2014 03:47:59 -0400 Received: by mail-wi0-f175.google.com with SMTP id cc10so686291wib.8 for ; Fri, 04 Apr 2014 00:47:58 -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=mzHGblBBKDj1/EUp1Y0BrUOBwvQSDRGp432tX/Yt57g=; b=L1T4YYiuEW01Jz895N0vC5EPUqSONgZqhKGSB0r1ZnI1SIq38XMMEBP2/McoFC1uYF jt0rLFxjRzFLbC4hj77cuPgIy+STWGdsm0tkZGytPmaGK7TWpbEIIAraOvm7e6WC2ex1 oWaKPxXszEVu2vXkAcK48IkU89GwNiCEqmAuCuN/VUEm4rVR2FrP4J6PWItsxUv247/S YoAmKuWVJ9ZfKPz5Zk4RL7kfm1HQgqPsNirlq8ftZ/ELhDwW0EV3M0SbS4huTY/3eEyc bIg0XQOgRUV72F+PZVyY2XDdE+moWieFsBCWOsJdTeppbc9WwNF757iczFYOR4KBCkI8 +tJw== X-Gm-Message-State: ALoCoQkyJ1OzFreNMyBf9gB9V6tz6l3apcp3os+hKt+3YlRBBfd0TzjEWaNEAa2d7ACL7RmtpcF0 X-Received: by 10.194.119.168 with SMTP id kv8mr17401545wjb.41.1396597678018; Fri, 04 Apr 2014 00:47:58 -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.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Apr 2014 00:47:57 -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 08/17] ARM: exynos: cpuidle: Move scu_enable in the cpu_pm notifier Date: Fri, 4 Apr 2014 09:47:54 +0200 Message-Id: <1396597683-6969-9-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 We make the cpuidle code less arch dependent. Signed-off-by: Daniel Lezcano --- arch/arm/mach-exynos/cpuidle.c | 6 ------ arch/arm/mach-exynos/pm.c | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 4b090cf..c63ad05 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -18,7 +18,6 @@ #include #include -#include #include #include #include @@ -94,11 +93,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, cpu_pm_enter(); cpu_suspend(0, idle_finisher); - -#ifdef CONFIG_SMP - if (!soc_is_exynos5250()) - scu_enable(S5P_VA_SCU); -#endif cpu_pm_exit(); /* diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index b2a075e..f43a004 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -386,6 +386,9 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self, break; case CPU_PM_EXIT: +#ifdef CONFIG_SMP + scu_enable(S5P_VA_SCU); +#endif exynos_cpu_restore_register(); break; }