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

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

diff --cc arch/arm/boot/dts/tegra20.dtsi
Simple merge

diff --cc arch/arm/boot/dts/tegra30.dtsi
Simple merge

diff --cc arch/arm/mach-tegra/platsmp.c
index 3ec7fc487857af2d3fa56152982ccbe4c6f8d459,8127d766fcfae0c1d19182ad77147188afe6302f..2ff68a47099d30a4caab97267c83f72b9234d833
--- 1/arch/arm/mach-tegra/platsmp.c
--- 2/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 void __iomem *scu_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE);
 +static cpumask_t tegra_cpu_init_mask;
 +
  #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 = {