Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2e13621 authored by Abhilash Kesavan's avatar Abhilash Kesavan Committed by Kukjin Kim
Browse files

ARM: S5P: Make the sleep code common for S5P series SoCs 



The sleep code for S5PV210 and EXYNOS4 are identical; moreover
S5p64X0 and S5PC100 for which support will be added soon can
use the same procedure. Create a common sleep code in the plat-s5p
directory so that it can be re-used.

Signed-off-by: default avatarAbhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 0da3bead

arch/arm/mach-exynos4/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -13,12 +13,14 @@ config CPU_EXYNOS4210 
	bool

	select SAMSUNG_DMADEV

	select S5P_PM if PM

	select S5P_SLEEP if PM

	help

	  Enable EXYNOS4210 CPU support



config SOC_EXYNOS4212

	bool

	select S5P_PM if PM

	select S5P_SLEEP if PM

	help

	  Enable EXYNOS4212 SoC support

arch/arm/mach-exynos4/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ obj-$(CONFIG_ARCH_EXYNOS4) += cpu.o init.o clock.o irq-combiner.o 
obj-$(CONFIG_ARCH_EXYNOS4)	+= setup-i2c0.o irq-eint.o dma.o pmu.o

obj-$(CONFIG_CPU_EXYNOS4210)	+= clock-exynos4210.o

obj-$(CONFIG_SOC_EXYNOS4212)	+= clock-exynos4212.o

obj-$(CONFIG_PM)		+= pm.o sleep.o

obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o



obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o

arch/arm/mach-s5pv210/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config CPU_S5PV210 
	select S5P_EXT_INT

	select S5P_HRT

	select S5P_PM if PM

	select S5P_SLEEP if PM

	help

	  Enable S5PV210 CPU support

arch/arm/mach-s5pv210/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ obj- := 


obj-$(CONFIG_CPU_S5PV210)	+= cpu.o init.o clock.o dma.o

obj-$(CONFIG_CPU_S5PV210)	+= setup-i2c0.o

obj-$(CONFIG_PM)		+= pm.o sleep.o

obj-$(CONFIG_PM)		+= pm.o



# machine support

arch/arm/mach-s5pv210/sleep.S

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s5p/sleep.S

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * S5PV210 power Manager (Suspend-To-RAM) support

 * Based on S3C2410 sleep code by:

 * 	Ben Dooks, (c) 2004 Simtec Electronics

 *

 * Based on PXA/SA1100 sleep code by:

 *	Nicolas Pitre, (c) 2002 Monta Vista Software Inc

 *	Cliff Brake, (c) 2001

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

*/



#include <linux/linkage.h>

#include <asm/assembler.h>

#include <asm/memory.h>



	.text



	/* sleep magic, to allow the bootloader to check for an valid

	 * image to resume to. Must be the first word before the

	 * s3c_cpu_resume entry.

	*/



	.word	0x2bedf00d



	/* s3c_cpu_resume

	 *

	 * resume code entry for bootloader to call

	 *

	 * we must put this code here in the data segment as we have no

	 * other way of restoring the stack pointer after sleep, and we

	 * must not write to the code segment (code is read-only)

	*/



ENTRY(s3c_cpu_resume)

	b	cpu_resume