From e26f4067405872b5d8b9efea9fc48cda97e39fc2 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Wed, 5 Jun 2013 16:45:53 +0900 Subject: 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 [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 --- arch/arm/mach-shmobile/pm-sh7372.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm/mach-shmobile/pm-sh7372.c') diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c index dec9293..0de75fd 100644 --- a/arch/arm/mach-shmobile/pm-sh7372.c +++ b/arch/arm/mach-shmobile/pm-sh7372.c @@ -351,6 +351,9 @@ static void sh7372_enter_a4s_common(int pllc0_on) static void sh7372_pm_setup_smfram(void) { + /* pass physical address of cpu_resume() to assembly resume code */ + sh7372_cpu_resume = virt_to_phys(cpu_resume); + memcpy((void *)SMFRAM, sh7372_resume_core_standby_sysc, 0x100); } #else -- cgit v1.1