diff options
author | Gaku Inami <gaku.inami.xw@bp.renesas.com> | 2015-03-16 14:48:43 +0900 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2015-03-17 08:05:13 +0900 |
commit | a8caad66904a7923c05fc4a137110085533ef00c (patch) | |
tree | 1ae9e73c55db36c2a62118eee8fe1069a8d1ceb5 /arch/arm/mach-shmobile/smp-r8a7790.c | |
parent | 78420b5dca18f2034f18925f5608cda2c960c3f3 (diff) |
ARM: shmobile: Consolidate the pm code for R-Car Gen2
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>
Diffstat (limited to 'arch/arm/mach-shmobile/smp-r8a7790.c')
-rw-r--r-- | arch/arm/mach-shmobile/smp-r8a7790.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/smp-r8a7790.c b/arch/arm/mach-shmobile/smp-r8a7790.c index 9c3da1345b8b..f8be41575d7c 100644 --- a/arch/arm/mach-shmobile/smp-r8a7790.c +++ b/arch/arm/mach-shmobile/smp-r8a7790.c @@ -23,6 +23,7 @@ #include "common.h" #include "platsmp-apmu.h" #include "pm-rcar.h" +#include "rcar-gen2.h" #include "r8a7790.h" static struct rcar_sysc_ch r8a7790_ca15_scu = { @@ -54,7 +55,7 @@ static void __init r8a7790_smp_prepare_cpus(unsigned int max_cpus) ARRAY_SIZE(r8a7790_apmu_config)); /* turn on power to SCU */ - r8a7790_pm_init(); + rcar_gen2_pm_init(); rcar_sysc_power_up(&r8a7790_ca15_scu); rcar_sysc_power_up(&r8a7790_ca7_scu); } |