From: Stephen Warren <swarren@nvidia.com>
Date: Mon, 28 Jan 2013 18:22:46 +0000 (-0700)
Subject: Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114
X-Git-Tag: v3.9-rc1~118^2~6^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee059485175b21079d3639f167980d354afb3d4b;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114

Conflicts:
	arch/arm/mach-tegra/platsmp.c
---

ee059485175b21079d3639f167980d354afb3d4b
diff --cc arch/arm/mach-tegra/platsmp.c
index 3ec7fc4,8127d76..2ff68a4
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@@ -37,9 -36,6 +37,8 @@@
  
  extern void tegra_secondary_startup(void);
  
 +static cpumask_t tegra_cpu_init_mask;
- static void __iomem *scu_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE);
 +
  #define EVP_CPU_RESET_VECTOR \
  	(IO_ADDRESS(TEGRA_EXCEPTION_VECTORS_BASE) + 0x100)
  
@@@ -199,10 -148,9 +183,11 @@@ static void __init tegra_smp_init_cpus(
  
  static void __init tegra_smp_prepare_cpus(unsigned int max_cpus)
  {
 -	tegra_cpu_reset_handler_init();
 +	/* Always mark the boot CPU (CPU0) as initialized. */
 +	cpumask_set_cpu(0, &tegra_cpu_init_mask);
 +
- 	scu_enable(scu_base);
+ 	if (scu_a9_has_base())
+ 		scu_enable(IO_ADDRESS(scu_a9_get_base()));
  }
  
  struct smp_operations tegra_smp_ops __initdata = {