From patchwork Thu Apr 10 09:55:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 3961341 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 488EEC0DA2 for ; Thu, 10 Apr 2014 09:56:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6751120629 for ; Thu, 10 Apr 2014 09:56:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 977CB2062E for ; Thu, 10 Apr 2014 09:56:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965147AbaDJJz7 (ORCPT ); Thu, 10 Apr 2014 05:55:59 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:46291 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965605AbaDJJzp (ORCPT ); Thu, 10 Apr 2014 05:55:45 -0400 Received: by mail-wg0-f48.google.com with SMTP id l18so3683701wgh.31 for ; Thu, 10 Apr 2014 02:55:44 -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=dP8Gh+EXUYDrDNmbE6EMMg4mfY6O/HI5qpuoWcjrnlg=; b=RcABoI4iyId0HOR6wgWgVbWjROAwH810hCUuces7XgyOYdXmiA4ewc9MJvKxittXgC 2xqHrN/TAQCLaDqIxKEwawiNuh7s+Mm4uRsnoO6hZI/a03i+Wc44gl0sfYM5ryHdw1My 0aBBmulh3lzESez+aqg7zYyj/zRlM8RWh9vIfjxG2NetmLjRk+lenlZG0jIcSHsVnkuT DVL0uO7hG6ksZpvdA4vIeo3NjE5CDHXzW9igBt/LLy2toJuq9dhijkl9zEhmpU935QVq bGdj0J6BLoS1TMv+FKWqUnXGl9CCeDbRC5yKHA0PsG5Ss5D4Xnn/Q0258IgVfN5hOo5Q eHLg== X-Gm-Message-State: ALoCoQmXjK7PEmluhlcw5qfl9VUdLlMSMNxcviUBIZT9vhFPdIRlordQHu11Dft3GX4eRL7rWLZT X-Received: by 10.180.78.225 with SMTP id e1mr33360167wix.17.1397123744580; Thu, 10 Apr 2014 02:55:44 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-377-242.w86-199.abo.wanadoo.fr. [86.199.232.242]) by mx.google.com with ESMTPSA id hu7sm15690125wib.10.2014.04.10.02.55.43 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 02:55:43 -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, b.zolnierkie@samsung.com, sachin.kamat@linaro.org, viresh.kumar@linaro.org, rjw@rjwysocki.net Subject: [PATCH V4 08/20] ARM: exynos: cpuidle: Move scu_enable in the cpu_pm notifier Date: Thu, 10 Apr 2014 11:55:39 +0200 Message-Id: <1397123751-1957-9-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397123751-1957-1-git-send-email-daniel.lezcano@linaro.org> References: <1397123751-1957-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 Reviewed-by: Viresh Kumar Reviewed-by: Bartlomiej Zolnierkiewicz Reviewed-by: Tomasz Figa --- arch/arm/mach-exynos/cpuidle.c | 6 ------ arch/arm/mach-exynos/pm.c | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 7f1f4ef..ce31004 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 @@ -93,11 +92,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 67d75fe..aba577f 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -336,6 +336,10 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self, case CPU_PM_EXIT: if (cpu == 0) { +#ifdef CONFIG_SMP + if (!soc_is_exynos5250()) + scu_enable(S5P_VA_SCU); +#endif exynos_cpu_restore_register(); } break;