Merge branch 'next/soc' into for-next

* next/soc:
  ARM: vexpress: Select multi-cluster SMP operation if required
  ARM: vexpress/dcscb: handle platform coherency exit/setup and CCI
  ARM: vexpress/dcscb: do not hardcode number of CPUs per cluster
  ARM: vexpress/dcscb: add CPU use counts to the power up/down API implementation
  ARM: vexpress: introduce DCSCB support
  ARM: introduce common set_auxcr/get_auxcr functions
  drivers/bus: arm-cci: function to enable CCI ports from early boot code
  drivers: bus: add ARM CCI support
  ARM: Enable selection of SMP operations at boot time
  arm: introduce psci_smp_ops
  ARM: ARMv7-M: implement read_cpuid_ext
  ARM: ARMv7-M: Allow the building of new kernel port
  ARM: ARMv7-M: Add support for exception handling
  ARM: Add base support for ARMv7-M

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/arm-soc-for-next-contents.txt
index 8e23179759cdea2799ad42649970441a1686b660,0000000000000000000000000000000000000000..1359718fda7aead871c6351d54dae5ed6410e96d
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,57 -1,0 +1,63 @@@
 +for-next contents for 3.11: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +      <topic branch>
 +              <contents>
 +              <...>
 +      <...>
 +
++depends/rmk-devel-stable
++      http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git devel-stable
++
 +next/fixes-non-critical
 +      mvebu/fixes-non-critical
 +              git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1
 +
 +next/cleanup
 +      at91/cleanup
 +              git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +      machdesc/cleanup
 +              git://github.com/mripard/linux.git tags/arm-soc-cleanups-for-3.11
 +      mvebu/cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-3
 +      dt/pci-helpers
 +              git://git.infradead.org/users/jcooper/linux.git tags/of_pci-3.11
 +
 +next/soc
 +      mvebu/soc
 +              git://git.infradead.org/users/jcooper/linux.git tags/soc-3.11-2
 +      mvebu/defconfig
 +              git://git.infradead.org/users/jcooper/linux.git tags/defconfig-3.11-3
 +      mvebu/pcie
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie-3.11-2
 +      mvebu/pcie-kirkwood
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11
 +      mvebu/pcie2
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_bridge-3.11
 +      mvebu/clk-cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/seb_clk-3.11
++      vexpress/dual-cluster
++              git://git.linaro.org/people/nico/linux VExpress_DCSCB
++              depends on depends/rmk-devel-stable
 +
 +next/boards
 +      mvebu/boards
 +                git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2
 +
 +
 +next/dt
 +      nomadik/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc
 +      mvebu/dt
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-3
 +
 +next/drivers
 +      ux500/dma40
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc
 +
 +next/mailbox:
 +      mailbox/subsystem
 +              git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox
 +
 +

diff --cc arch/arm/mach-vexpress/v2m.c
index d6016970e2fe1aad9694c699a08572acb5b17151,b0eccf7e06ecb0331a32973acc5664d8fedaa933..95a469e23e378078af77ffcd9eecc9b29e5ff264
--- 1/arch/arm/mach-vexpress/v2m.c
--- 2/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@@ -455,8 -456,10 +455,9 @@@ static const char * const v2m_dt_match[
  DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
        .dt_compat      = v2m_dt_match,
        .smp            = smp_ops(vexpress_smp_ops),
+       .smp_init       = smp_init_ops(vexpress_smp_init_ops),
        .map_io         = v2m_dt_map_io,
        .init_early     = v2m_dt_init_early,
 -      .init_irq       = irqchip_init,
        .init_time      = v2m_dt_timer_init,
        .init_machine   = v2m_dt_init,
  MACHINE_END

diff --cc arch/arm/mach-virt/virt.c
index bdf05f41ca903141a34e30b1baa61a7e867a9fa4,a67d2dd5bb6062e7eede85ef612ac6c072c9e7ea..b184e57d1854a552346aba0c985d060ce73775b2
--- 1/arch/arm/mach-virt/virt.c
--- 2/arch/arm/mach-virt/virt.c
+++ b/arch/arm/mach-virt/virt.c
@@@ -35,10 -36,8 +35,7 @@@ static const char *virt_dt_match[] = 
        NULL
  };
  
- extern struct smp_operations virt_smp_ops;
- 
  DT_MACHINE_START(VIRT, "Dummy Virtual Machine")
 -      .init_irq       = irqchip_init,
        .init_machine   = virt_init,
-       .smp            = smp_ops(virt_smp_ops),
        .dt_compat      = virt_dt_match,
  MACHINE_END