Merge tag 'platform-drivers-x86-v4.7-1' of git://git.infradead.org/users/dvhart/linux...

[cascardo/linux.git] / arch / arm / mach-shmobile / platsmp-scu.c

diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c
index 081a097..8d478f1 100644 (file)
--- a/arch/arm/mach-shmobile/platsmp-scu.c
+++ b/arch/arm/mach-shmobile/platsmp-scu.c
@@ -18,7 +18,8 @@
 #include "common.h"
 
 
-void __iomem *shmobile_scu_base;
+static phys_addr_t shmobile_scu_base_phys;
+static void __iomem *shmobile_scu_base;
 
 static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
                                          unsigned long action, void *hcpu)
@@ -29,7 +30,7 @@ static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
        case CPU_UP_PREPARE:
                /* For this particular CPU register SCU SMP boot vector */
                shmobile_smp_hook(cpu, virt_to_phys(shmobile_boot_scu),
-                                 (unsigned long)shmobile_scu_base);
+                                 shmobile_scu_base_phys);
                break;
        };
 
@@ -40,12 +41,15 @@ static struct notifier_block shmobile_smp_scu_notifier = {
        .notifier_call = shmobile_smp_scu_notifier_call,
 };
 
-void __init shmobile_smp_scu_prepare_cpus(unsigned int max_cpus)
+void __init shmobile_smp_scu_prepare_cpus(phys_addr_t scu_base_phys,
+                                         unsigned int max_cpus)
 {
        /* install boot code shared by all CPUs */
        shmobile_boot_fn = virt_to_phys(shmobile_smp_boot);
 
        /* enable SCU and cache coherency on booting CPU */
+       shmobile_scu_base_phys = scu_base_phys;
+       shmobile_scu_base = ioremap(scu_base_phys, PAGE_SIZE);
        scu_enable(shmobile_scu_base);
        scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);