From patchwork Fri Apr 11 10:40:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 3967661 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 C94D3BFF02 for ; Fri, 11 Apr 2014 10:40:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE3F2207F6 for ; Fri, 11 Apr 2014 10:40:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23E8C207F3 for ; Fri, 11 Apr 2014 10:40:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756804AbaDKKkb (ORCPT ); Fri, 11 Apr 2014 06:40:31 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:56571 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934491AbaDKKkK (ORCPT ); Fri, 11 Apr 2014 06:40:10 -0400 Received: by mail-wi0-f170.google.com with SMTP id bs8so2316312wib.1 for ; Fri, 11 Apr 2014 03:40:08 -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=7Ry7PKz7smLai1IuHUsqABuXUcrDX4kAEPJK1OGMl6E=; b=dbgryKWL0teJaSTej6ym0qD7JWa0t8x2CqpRkS0DgGMcO9/2VrWgWjyJIBtBVJJw5r pVgDXMs/dt37IrCuMvH0ZaghLAxvxNFib4zZnAby/zYu8oZmIoLLPVh7dvWoY21OvDmE BaGuOY5PUJfWVadK8msG8EvA5fngFFmOAKewQoxjA6wri/tGMCfiYYBBz2+PIbA1FQAe hDNXrYU4Co6wbU4QP/kDVPDhhLnInHVWrb9Fk+LOmeDasZr5ZDVHvmn6xlP+hBCwlrdB +4IHGxOpuNEIen4IhzMMw3MjD0Osz0GC73z1L5GI8Wqdp2fx1s/lRKRPhfhduxY1zYpG Qoow== X-Gm-Message-State: ALoCoQlDLjfVpt0MuyRjSkO135cLc9DRV4G5YBM7ICufF0XJuYLjsuJQQmk3c8t76IO0IJ7GbTSq X-Received: by 10.180.90.207 with SMTP id by15mr2866445wib.48.1397212808869; Fri, 11 Apr 2014 03:40:08 -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 eq8sm3683033wib.16.2014.04.11.03.40.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Apr 2014 03:40:08 -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 V5 09/20] ARM: exynos: cpuidle: Move scu_enable in the cpu_pm notifier Date: Fri, 11 Apr 2014 12:40:04 +0200 Message-Id: <1397212815-16068-10-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397212815-16068-1-git-send-email-daniel.lezcano@linaro.org> References: <1397212815-16068-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.3 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 aa8ab1b..95826c6 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 @@ -74,11 +73,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;