From dfbc0858b1f4290b9bb6474b997d2f99f65ac441 Mon Sep 17 00:00:00 2001 From: Hiroshi Doyu Date: Tue, 22 Jan 2013 07:52:02 +0200 Subject: [PATCH] --- yaml --- r: 355583 b: refs/heads/master c: 909444ab20629ebc4478642b660a391700aa7e33 h: refs/heads/master i: 355581: 246432152191a0ba61026e8bf43e3b0474367819 355579: c2661258e34bb9e1a4026aac1b72b34865cc37f3 355575: 7854534d664f6cd900ed3ca52a97571b825e67cf 355567: fad142dc0606a5153ce6d94f387ed016adac6682 355551: bab0af42c1d2b7d11cfd22f0b8d29a806608f89c 355519: a19353c9604a815f44ebd6f86a5ad02e104eef18 355455: 04c5140b0c3d821b93ed2f4450fb9a644bd5e0c6 355327: ccd114e9823f0d5e49a62d8650eb47bfd03fa4fe v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/platsmp.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 31d61b7ebfe1..a40f2495f994 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9d6b3358ac35901ccc6a4a5a317670fa469db25 +refs/heads/master: 909444ab20629ebc4478642b660a391700aa7e33 diff --git a/trunk/arch/arm/mach-tegra/platsmp.c b/trunk/arch/arm/mach-tegra/platsmp.c index 79fa7857d68d..8127d766fcfa 100644 --- a/trunk/arch/arm/mach-tegra/platsmp.c +++ b/trunk/arch/arm/mach-tegra/platsmp.c @@ -36,8 +36,6 @@ extern void tegra_secondary_startup(void); -static void __iomem *scu_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE); - #define EVP_CPU_RESET_VECTOR \ (IO_ADDRESS(TEGRA_EXCEPTION_VECTORS_BASE) + 0x100) @@ -151,7 +149,8 @@ static void __init tegra_smp_init_cpus(void) static void __init tegra_smp_prepare_cpus(unsigned int max_cpus) { tegra_cpu_reset_handler_init(); - scu_enable(scu_base); + if (scu_a9_has_base()) + scu_enable(IO_ADDRESS(scu_a9_get_base())); } struct smp_operations tegra_smp_ops __initdata = {