From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 22 Nov 2012 09:55:09 +0000 (+0100)
Subject: Merge tag 'marvell-armadaxp-smp-for-3.8' of github.com:MISL-EBU-System-SW/mainline... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1112b36094e48f89ce7dca5aee90b05c30162da9;p=linux-beck.git

Merge tag 'marvell-armadaxp-smp-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into mevbu-dt-additions

SMP support for Armada XP

The purpose of this series is to add the SMP support for the Armada XP
SoCs. Beside the SMP support itself brought by the last 3 commits,
this series also adds the support for the coherency fabric unit and
the power management service unit.

The coherency fabric is responsible for ensuring hardware coherency
between all CPUs and between CPUs and I/O masters. This unit is also
available for Armada 370 and will be used in an incoming patch set
for hardware I/O cache coherency.

The power management service unit is responsible for powering down and
waking up CPUs and other SOC units.

Conflicts:
	arch/arm/mach-mvebu/armada-370-xp.c
---

1112b36094e48f89ce7dca5aee90b05c30162da9
diff --cc arch/arm/mach-mvebu/armada-370-xp.c
index bd4e13f1b1d7,472e70ffce8d..7434b5e36197
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@@ -62,17 -52,19 +63,19 @@@ struct sys_timer armada_370_xp_timer = 
  static void __init armada_370_xp_dt_init(void)
  {
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+ 	coherency_init();
  }
  
 -static const char * const armada_370_xp_dt_board_dt_compat[] = {
 -	"marvell,a370-db",
 -	"marvell,axp-db",
 +static const char * const armada_370_xp_dt_compat[] = {
 +	"marvell,armada-370-xp",
  	NULL,
  };
  
 -DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)")
 +DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
+ 	.smp		= smp_ops(armada_xp_smp_ops),
  	.init_machine	= armada_370_xp_dt_init,
  	.map_io		= armada_370_xp_map_io,
 +	.init_early	= armada_370_xp_init_early,
  	.init_irq	= armada_370_xp_init_irq,
  	.handle_irq     = armada_370_xp_handle_irq,
  	.timer		= &armada_370_xp_timer,