From patchwork Wed Oct 1 16:01:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5013111 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 C16869F375 for ; Wed, 1 Oct 2014 16:02:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 065A920259 for ; Wed, 1 Oct 2014 16:02:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 247522026C for ; Wed, 1 Oct 2014 16:02:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753258AbaJAQCF (ORCPT ); Wed, 1 Oct 2014 12:02:05 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:64556 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753166AbaJAQCD (ORCPT ); Wed, 1 Oct 2014 12:02:03 -0400 Received: from klappe2.localnet (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue001) with ESMTP (Nemesis) id 0Lo5wv-1YBC7v3Usb-00gGFx; Wed, 01 Oct 2014 18:01:31 +0200 From: Arnd Bergmann To: Kukjin Kim Subject: Re: [GIT PULL 3/3] 3rd Round of Exynos-PM-2 Updates for v3.18 Date: Wed, 1 Oct 2014 18:01:29 +0200 User-Agent: KMail/1.12.2 (Linux/3.8.0-35-generic; KDE/4.3.2; x86_64; ; ) Cc: "'Olof Johansson'" , Kevin Hilman , arm@kernel.org, "linux-arm-kernel@lists.infradead.org" , "linux-samsung-soc@vger.kernel.org" References: <54244973.7090204@samsung.com> In-Reply-To: <54244973.7090204@samsung.com> MIME-Version: 1.0 Message-Id: <201410011801.29389.arnd@arndb.de> X-Provags-ID: V02:K0:tkYfU5iTm/QoZMbBZBO1LDc/O+jRmmz4KZZNZgGaV+r GFVTN1ZtJ/sHX7XxbtYro7rNniQH0UG/7SXbv9qAawVk0Jd/cl Qdghn68hkInTCV4TwW0DA+hZPNc9834Qz6iqhTjYZ2bQKD4prh jp3PD1NSr7Tqr9AdJy7VNmQ2Lrsb/7dl3EJ3oDgRv7DSEm9i4u 5fEXDn4fzuAc5Rn4AG3fpJwz76cVyCIkiVxzSUUcPpHK5F2paT bqzPPjFC/YLBUs8Z/5/zx/7VObANwY5E5ppZwz6l83t1dUqlhN lF+4JDBRVvaCjAVS8iC9S2OehfNJ/1FXuGAXkIGUI4kDLaJJiU dvWefUI+tiKfLSdbiLHA= X-UI-Out-Filterresults: notjunk:1; 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=unavailable 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 On Thursday 25 September 2014, Kukjin Kim wrote: > Exynos 2nd PM related updates for v3.18 > > - Firmware supporting suspend and resume to excute of low > level operations to enter and leave power mode for exynos > : introduce suspend() and resume() firmware operations > > - Fix AFTR mode on boards with secure firmware enabled and > allows exynos cpuidle driver usage on exynos4x12 SoCs > > - Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=y > > - SWRESET is needed to boot secondary CPU on exynos3250 > I needed another fixup to make this build, but I'm not sure about whether this is the right solution. I decided not to pull this one, please test again with and without my patch for the case that ARM_CPU_SUSPEND is disabled. Arnd --- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 64324bf5edb4..aaab67d84bf6 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -14,9 +14,9 @@ obj- := # Core -obj-$(CONFIG_ARCH_EXYNOS) += exynos.o pmu.o exynos-smc.o firmware.o sleep.o +obj-$(CONFIG_ARCH_EXYNOS) += exynos.o pmu.o exynos-smc.o firmware.o -obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm.o +obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm.o sleep.o obj-$(CONFIG_PM_SLEEP) += suspend.o obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c index 2c5bc6bfcbdf..b7ff8f25bf4a 100644 --- a/arch/arm/mach-exynos/firmware.c +++ b/arch/arm/mach-exynos/firmware.c @@ -129,11 +129,11 @@ static int exynos_resume(void) } static const struct firmware_ops exynos_firmware_ops = { - .do_idle = exynos_do_idle, + .do_idle = IS_ENABLED(CONFIG_EXYNOS_CPU_SUSPEND) ? exynos_do_idle : NULL, .set_cpu_boot_addr = exynos_set_cpu_boot_addr, .cpu_boot = exynos_cpu_boot, - .suspend = exynos_suspend, - .resume = exynos_resume, + .suspend = IS_ENABLED(CONFIG_PM_SLEEP) ? exynos_suspend : NULL, + .resume = IS_ENABLED(CONFIG_PM_SLEEP) ? exynos_resume : NULL, }; void __init exynos_firmware_init(void)