aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/include/mach
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-06-05 03:45:53 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-06-17 03:06:47 -0400
commite26f4067405872b5d8b9efea9fc48cda97e39fc2 (patch)
tree3220ae2befbf96b5d73df781c2b146cff7ef5a78 /arch/arm/mach-shmobile/include/mach
parent4f309d272f7139278f52cf1e2dcf5b2bc8c029d9 (diff)
ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys()
Instead of having a hard coded virt-to-phys address conversion code in sleep-sh7372.S, rework the code to do the conversion in C using virt_to_phys(). This removes the need for PLAT_PHYS_OFFSET which in turn is needed for ARCH_MULTIPLATFORM. Signed-off-by: Magnus Damm <damm@opensource.se> [horms+renesas@verge.net.au: squashed in build fix posted as "ARM: shmobile: sh7372 build fix for SUSPEND=n && CPU_IDLE=n"] Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach')
-rw-r--r--arch/arm/mach-shmobile/include/mach/sh7372.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index e882717ca97f..854a9f0ca040 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -75,6 +75,8 @@ extern void sh7372_intcs_resume(void);
75extern void sh7372_intca_suspend(void); 75extern void sh7372_intca_suspend(void);
76extern void sh7372_intca_resume(void); 76extern void sh7372_intca_resume(void);
77 77
78extern unsigned long sh7372_cpu_resume;
79
78#ifdef CONFIG_PM 80#ifdef CONFIG_PM
79extern void __init sh7372_init_pm_domains(void); 81extern void __init sh7372_init_pm_domains(void);
80#else 82#else