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: 28271 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 36FDC2100C for ; Fri, 11 Apr 2014 10:40:51 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id il7sf15551187vcb.9 for ; Fri, 11 Apr 2014 03:40:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=YvkmkdNC0dAA4HTuDZk0ZKjt6924cjBdKmrvpDIGV+I=; b=UFTF+GdMp6m+Jmv8ZYQOUbMXG/92OgHkZOUn+xUl4r1Pj+0+nhR2cONOArODqoSQA4 jo1EWidpI6t56pieqQu24ZNSAWYsungiZIyywFCgv9AEgeY+Z/Ljm4rs/EnoD9UvLEN1 v6lwWd1N6YrcVejkFdTe4vbxjUZDirb7wApiiApcN520d6/VKpHlqU1CF2DzGeXupc5c fVLnTp+lGbqa/gUtNZn6tiMnJEuksBep2C5IqlXTZuV9Wkem0ZE+rvSNAKEKIQ+z7ByN bbvZ/Y2a672Z1EV27CRRzj+72pwbFEehzH9JUr2pWR009w0cLu7zciyNydiI37u+D90N /e/A== X-Gm-Message-State: ALoCoQlaIiwtl8sQ2Qt94gS7ryFrTi02Em21vvH8Jrwc5nOY8vWgpqSLB9F/V3cO13ovJVuLHg2S X-Received: by 10.58.77.204 with SMTP id u12mr10305214vew.24.1397212850897; Fri, 11 Apr 2014 03:40:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.90.11 with SMTP id w11ls1511174qgd.43.gmail; Fri, 11 Apr 2014 03:40:50 -0700 (PDT) X-Received: by 10.52.251.199 with SMTP id zm7mr16294797vdc.21.1397212850763; Fri, 11 Apr 2014 03:40:50 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id ya4si1226723vec.163.2014.04.11.03.40.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Apr 2014 03:40:50 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id ib6so4732803vcb.27 for ; Fri, 11 Apr 2014 03:40:50 -0700 (PDT) X-Received: by 10.221.55.133 with SMTP id vy5mr19304959vcb.17.1397212850595; Fri, 11 Apr 2014 03:40:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp46154vcb; Fri, 11 Apr 2014 03:40:50 -0700 (PDT) X-Received: by 10.68.113.194 with SMTP id ja2mr26392924pbb.30.1397212849816; Fri, 11 Apr 2014 03:40:49 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id iw3si3967193pac.14.2014.04.11.03.40.49; Fri, 11 Apr 2014 03:40:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756804AbaDKKkb (ORCPT + 8 others); 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-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: list List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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;