ARM: shmobile: Consolidate the pm code for R-Car Gen2
authorGaku Inami <gaku.inami.xw@bp.renesas.com>
Mon, 16 Mar 2015 05:48:43 +0000 (14:48 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Mon, 16 Mar 2015 23:05:13 +0000 (08:05 +0900)
The pm code for R-Car Gen2 is scatterd in each SoC. These files
(pm-r8a7790.c/pm-r8a7791.c) have some overlap code. This change
consolidate the pm code for R-Car Gen2 into one.

Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/pm-r8a7790.c [deleted file]
arch/arm/mach-shmobile/pm-r8a7791.c [deleted file]
arch/arm/mach-shmobile/pm-rcar-gen2.c [new file with mode: 0644]
arch/arm/mach-shmobile/r8a7790.h
arch/arm/mach-shmobile/r8a7791.h
arch/arm/mach-shmobile/rcar-gen2.h
arch/arm/mach-shmobile/smp-r8a7790.c
arch/arm/mach-shmobile/smp-r8a7791.c

Simple merge
diff --cc arch/arm/mach-shmobile/pm-r8a7790.c
Simple merge
diff --cc arch/arm/mach-shmobile/pm-r8a7791.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge