From: Daniel Lezcano <daniel.lezcano@linaro.org> 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 14/17] ARM: exynos: cpuidle: Move the boot vector in pm.c Date: Fri, 4 Apr 2014 09:48:00 +0200 [thread overview] Message-ID: <1396597683-6969-15-git-send-email-daniel.lezcano@linaro.org> (raw) In-Reply-To: <1396597683-6969-1-git-send-email-daniel.lezcano@linaro.org> As usual, move the boot vector setting in the pm.c file and use the cpu_pm notifier to set it up. Remove the unused headers. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-exynos/cpuidle.c | 22 ---------------------- arch/arm/mach-exynos/pm.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 3872c1e..1916dc6 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -8,42 +8,20 @@ * published by the Free Software Foundation. */ -#include <linux/kernel.h> -#include <linux/init.h> #include <linux/cpuidle.h> #include <linux/cpu_pm.h> -#include <linux/io.h> -#include <linux/export.h> -#include <linux/time.h> #include <linux/platform_device.h> #include <asm/proc-fns.h> #include <asm/suspend.h> -#include <asm/unified.h> #include <asm/cpuidle.h> #include <plat/cpu.h> -#include <plat/pm.h> - -#include <mach/pm-core.h> -#include <mach/map.h> #include "common.h" -#include "regs-pmu.h" - -#define REG_DIRECTGO_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \ - S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ - (S5P_VA_SYSRAM + 0x24) : S5P_INFORM0)) -#define REG_DIRECTGO_FLAG (samsung_rev() == EXYNOS4210_REV_1_1 ? \ - S5P_INFORM6 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ - (S5P_VA_SYSRAM + 0x20) : S5P_INFORM1)) static int idle_finisher(unsigned long flags) { - - __raw_writel(virt_to_phys(s3c_cpu_resume), REG_DIRECTGO_ADDR); - __raw_writel(S5P_CHECK_AFTR, REG_DIRECTGO_FLAG); - /* Set value of power down register for aftr mode */ exynos_sys_powerdown_conf(SYS_AFTR); diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 1c9d253..47fa9bd 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -79,6 +79,14 @@ #define EXYNOS5_PWR_CTRL2_CORE2_UP_RATIO (1 << 4) #define EXYNOS5_PWR_CTRL2_CORE1_UP_RATIO (1 << 0) +#define EXYNOS_BOOT_VECTOR_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \ + S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ + (S5P_VA_SYSRAM + 0x24) : S5P_INFORM0)) + +#define EXYNOS_BOOT_VECTOR_FLAG (samsung_rev() == EXYNOS4210_REV_1_1 ? \ + S5P_INFORM6 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ + (S5P_VA_SYSRAM + 0x20) : S5P_INFORM1)) + static const struct sleep_save exynos4_set_clksrc[] = { { .reg = EXYNOS4_CLKSRC_MASK_TOP , .val = 0x00000001, }, { .reg = EXYNOS4_CLKSRC_MASK_CAM , .val = 0x11111111, }, @@ -189,6 +197,12 @@ static void __init exynos5_core_down_clk(void) __raw_writel(tmp, EXYNOS5_PWR_CTRL2); } +static void exynos_cpu_set_boot_vector(void) +{ + __raw_writel(virt_to_phys(s3c_cpu_resume), EXYNOS_BOOT_VECTOR_ADDR); + __raw_writel(S5P_CHECK_AFTR, EXYNOS_BOOT_VECTOR_FLAG); +} + static int exynos_cpu_suspend(unsigned long arg) { #ifdef CONFIG_CACHE_L2X0 @@ -450,6 +464,7 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self, exynos_pm_central_suspend(); exynos_cpu_save_register(); exynos_set_wakeupmask(); + exynos_cpu_set_boot_vector(); break; case CPU_PM_EXIT: -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: daniel.lezcano@linaro.org (Daniel Lezcano) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 14/17] ARM: exynos: cpuidle: Move the boot vector in pm.c Date: Fri, 4 Apr 2014 09:48:00 +0200 [thread overview] Message-ID: <1396597683-6969-15-git-send-email-daniel.lezcano@linaro.org> (raw) In-Reply-To: <1396597683-6969-1-git-send-email-daniel.lezcano@linaro.org> As usual, move the boot vector setting in the pm.c file and use the cpu_pm notifier to set it up. Remove the unused headers. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-exynos/cpuidle.c | 22 ---------------------- arch/arm/mach-exynos/pm.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 3872c1e..1916dc6 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -8,42 +8,20 @@ * published by the Free Software Foundation. */ -#include <linux/kernel.h> -#include <linux/init.h> #include <linux/cpuidle.h> #include <linux/cpu_pm.h> -#include <linux/io.h> -#include <linux/export.h> -#include <linux/time.h> #include <linux/platform_device.h> #include <asm/proc-fns.h> #include <asm/suspend.h> -#include <asm/unified.h> #include <asm/cpuidle.h> #include <plat/cpu.h> -#include <plat/pm.h> - -#include <mach/pm-core.h> -#include <mach/map.h> #include "common.h" -#include "regs-pmu.h" - -#define REG_DIRECTGO_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \ - S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ - (S5P_VA_SYSRAM + 0x24) : S5P_INFORM0)) -#define REG_DIRECTGO_FLAG (samsung_rev() == EXYNOS4210_REV_1_1 ? \ - S5P_INFORM6 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ - (S5P_VA_SYSRAM + 0x20) : S5P_INFORM1)) static int idle_finisher(unsigned long flags) { - - __raw_writel(virt_to_phys(s3c_cpu_resume), REG_DIRECTGO_ADDR); - __raw_writel(S5P_CHECK_AFTR, REG_DIRECTGO_FLAG); - /* Set value of power down register for aftr mode */ exynos_sys_powerdown_conf(SYS_AFTR); diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 1c9d253..47fa9bd 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -79,6 +79,14 @@ #define EXYNOS5_PWR_CTRL2_CORE2_UP_RATIO (1 << 4) #define EXYNOS5_PWR_CTRL2_CORE1_UP_RATIO (1 << 0) +#define EXYNOS_BOOT_VECTOR_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \ + S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ + (S5P_VA_SYSRAM + 0x24) : S5P_INFORM0)) + +#define EXYNOS_BOOT_VECTOR_FLAG (samsung_rev() == EXYNOS4210_REV_1_1 ? \ + S5P_INFORM6 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ + (S5P_VA_SYSRAM + 0x20) : S5P_INFORM1)) + static const struct sleep_save exynos4_set_clksrc[] = { { .reg = EXYNOS4_CLKSRC_MASK_TOP , .val = 0x00000001, }, { .reg = EXYNOS4_CLKSRC_MASK_CAM , .val = 0x11111111, }, @@ -189,6 +197,12 @@ static void __init exynos5_core_down_clk(void) __raw_writel(tmp, EXYNOS5_PWR_CTRL2); } +static void exynos_cpu_set_boot_vector(void) +{ + __raw_writel(virt_to_phys(s3c_cpu_resume), EXYNOS_BOOT_VECTOR_ADDR); + __raw_writel(S5P_CHECK_AFTR, EXYNOS_BOOT_VECTOR_FLAG); +} + static int exynos_cpu_suspend(unsigned long arg) { #ifdef CONFIG_CACHE_L2X0 @@ -450,6 +464,7 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self, exynos_pm_central_suspend(); exynos_cpu_save_register(); exynos_set_wakeupmask(); + exynos_cpu_set_boot_vector(); break; case CPU_PM_EXIT: -- 1.7.9.5
next prev parent reply other threads:[~2014-04-04 7:48 UTC|newest] Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-04-04 7:47 [PATCH 00/17] ARM: exynos: cpuidle: Move the driver to drivers/cpuidle Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 7:47 ` [PATCH 01/17] ARM: exynos: cpuidle: Prevent forward declaration Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:42 ` Viresh Kumar 2014-04-04 8:42 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 02/17] ARM: exynos: cpuidle: use cpuidle_register Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:44 ` Viresh Kumar 2014-04-04 8:44 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 03/17] ARM: exynos: cpuidle: change function name prefix Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:45 ` Viresh Kumar 2014-04-04 8:45 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 04/17] ARM: exynos: cpuidle: encapsulate register access inside a function Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:46 ` Viresh Kumar 2014-04-04 8:46 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 05/17] ARM: exynos: cpuidle: Move some code inside the idle_finisher Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:50 ` Viresh Kumar 2014-04-04 8:50 ` Viresh Kumar 2014-04-04 9:02 ` Daniel Lezcano 2014-04-04 9:02 ` Daniel Lezcano 2014-04-04 7:47 ` [PATCH 06/17] ARM: exynos: cpuidle: Fix S5P_WAKEUP_STAT call Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:53 ` Viresh Kumar 2014-04-04 8:53 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 07/17] ARM: exynos: cpuidle: Use the cpu_pm notifier Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 7:47 ` [PATCH 08/17] ARM: exynos: cpuidle: Move scu_enable in " Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:57 ` Viresh Kumar 2014-04-04 8:57 ` Viresh Kumar 2014-04-04 9:03 ` Daniel Lezcano 2014-04-04 9:03 ` Daniel Lezcano 2014-04-04 7:47 ` [PATCH 09/17] ARM: exynos: cpuidle: Remove ifdef for scu_enable Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:58 ` Viresh Kumar 2014-04-04 8:58 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 10/17] ARM: exynos: cpuidle: Move exynos_set_wakeupmask in the cpu_pm notifier Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 8:59 ` Viresh Kumar 2014-04-04 8:59 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 11/17] ARM: exynos: cpuidle: Move the power sequence call " Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 9:02 ` Viresh Kumar 2014-04-04 9:02 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 12/17] ARM: exynos: cpuidle: Move S5P_CHECK_AFTR in a header Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 9:03 ` Viresh Kumar 2014-04-04 9:03 ` Viresh Kumar 2014-04-04 7:47 ` [PATCH 13/17] ARM: exynos: cpuidle: Move clock setup to pm.c Daniel Lezcano 2014-04-04 7:47 ` Daniel Lezcano 2014-04-04 9:05 ` Viresh Kumar 2014-04-04 9:05 ` Viresh Kumar 2014-04-04 7:48 ` Daniel Lezcano [this message] 2014-04-04 7:48 ` [PATCH 14/17] ARM: exynos: cpuidle: Move the boot vector in pm.c Daniel Lezcano 2014-04-04 9:05 ` Viresh Kumar 2014-04-04 9:05 ` Viresh Kumar 2014-04-04 7:48 ` [PATCH 15/17] ARM: exynos: cpuidle: Pass the AFTR callback to the platform_data Daniel Lezcano 2014-04-04 7:48 ` Daniel Lezcano 2014-04-04 9:09 ` Viresh Kumar 2014-04-04 9:09 ` Viresh Kumar 2014-04-04 7:48 ` [PATCH 16/17] ARM: exynos: cpuidle: Move the driver to drivers/cpuidle directory Daniel Lezcano 2014-04-04 7:48 ` Daniel Lezcano 2014-04-04 9:07 ` Viresh Kumar 2014-04-04 9:07 ` Viresh Kumar 2014-04-04 7:48 ` [PATCH 17/17] ARM: exynos: config: Enable cpuidle Daniel Lezcano 2014-04-04 7:48 ` Daniel Lezcano 2014-04-04 9:10 ` Viresh Kumar 2014-04-04 9:10 ` Viresh Kumar 2014-04-04 9:16 ` Daniel Lezcano 2014-04-04 9:16 ` Daniel Lezcano 2014-04-04 9:00 ` [PATCH 00/17] ARM: exynos: cpuidle: Move the driver to drivers/cpuidle Sachin Kamat 2014-04-04 9:00 ` Sachin Kamat 2014-04-04 9:55 ` Daniel Lezcano 2014-04-04 9:55 ` Daniel Lezcano
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=1396597683-6969-15-git-send-email-daniel.lezcano@linaro.org \ --to=daniel.lezcano@linaro.org \ --cc=kgene.kim@samsung.com \ --cc=linaro-kernel@lists.linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=rjw@rjwysocki.net \ --cc=t.figa@samsung.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.