diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-11 16:05:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-11 16:05:09 +0200 |
| commit | 191a66353b22fad8ac89404ab4c929cbe7b0afb2 (patch) | |
| tree | bd7affc4bc640eb42e5ff3285922497285f8fdd7 /arch/arm/mach-shmobile/smp-r8a7790.c | |
| parent | f5d6a52f511157c7476590532a23b5664b1ed877 (diff) | |
| parent | f21262b8e092a770e39fbd405cc18a0247c3af68 (diff) | |
| download | talos-op-linux-191a66353b22fad8ac89404ab4c929cbe7b0afb2.tar.gz talos-op-linux-191a66353b22fad8ac89404ab4c929cbe7b0afb2.zip | |
Merge branch 'x86/asm' into x86/apic, to resolve a conflict
Conflicts:
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/apic/vector.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-shmobile/smp-r8a7790.c')
| -rw-r--r-- | arch/arm/mach-shmobile/smp-r8a7790.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/smp-r8a7790.c b/arch/arm/mach-shmobile/smp-r8a7790.c index 9c3da1345b8b..930f45cbc08a 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 = { @@ -37,11 +38,11 @@ static struct rcar_sysc_ch r8a7790_ca7_scu = { static struct rcar_apmu_config r8a7790_apmu_config[] = { { - .iomem = DEFINE_RES_MEM(0xe6152000, 0x88), + .iomem = DEFINE_RES_MEM(0xe6152000, 0x188), .cpus = { 0, 1, 2, 3 }, }, { - .iomem = DEFINE_RES_MEM(0xe6151000, 0x88), + .iomem = DEFINE_RES_MEM(0xe6151000, 0x188), .cpus = { 0x100, 0x0101, 0x102, 0x103 }, } }; @@ -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); } |
