From: Jason Cooper <jason@lakedaemon.net>
Date: Wed, 21 Nov 2012 20:01:15 +0000 (+0000)
Subject: Merge tag 'marvell-armadaxp-smp-for-3.8' of git://github.com/MISL-EBU-System-SW/mainl... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=86b7d3f7797908914735da83eb30df9d81fbd50a;p=linux-beck.git

Merge tag 'marvell-armadaxp-smp-for-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything

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.
---

86b7d3f7797908914735da83eb30df9d81fbd50a
diff --cc arch/arm/mach-mvebu/armada-370-xp.c
index cd6eac17fb67,472e70ffce8d..a9cf335c7cb0
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@@ -71,9 -62,9 +73,10 @@@ static const char * const armada_370_xp
  };
  
  DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 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,