From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 3/3] 3rd Round of Exynos-PM-2 Updates for v3.18
Date: Wed, 1 Oct 2014 18:01:29 +0200 [thread overview]
Message-ID: <201410011801.29389.arnd@arndb.de> (raw)
In-Reply-To: <54244973.7090204@samsung.com>
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
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)
next prev parent reply other threads:[~2014-10-01 16:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-25 16:57 [GIT PULL 3/3] 3rd Round of Exynos-PM-2 Updates for v3.18 Kukjin Kim
2014-10-01 16:01 ` Arnd Bergmann [this message]
2014-10-01 16:49 ` Bartlomiej Zolnierkiewicz
2014-10-01 18:31 ` Arnd Bergmann
2014-10-02 13:35 ` Bartlomiej Zolnierkiewicz
2014-10-09 14:13 ` Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201410011801.29389.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).