Merge branch 'spear/multiplatform' into next/multiplatform

The spear platform has been cleaned up a lot by Viresh
Kumar, and is relatively easy to convert to multiplatform,
getting us one more step closer to having all ARMv7
platforms included.

I originally did this before 3.8 but merging it never
worked out so far, mostly because of conflicts against
patches in the DMA tree, but also because I did not push very
hard for these.

* spear/multiplatform:
  ARM: spear: enable spear13xx in multi_v7_defconfig
  ARM: spear: fix build error in restart.c
  ARM: spear: use multiplatform configuration options.
  ARM: spear: rename duplicate pl080_plat_data
  ARM: spear: make clock driver independent of headers
  ARM: spear: move generic.h and pl080.h into private dir
  ARM: spear: move all files to mach-spear
  ARM: spear: move spear.h and misc_regs.h into plat-spear
  ARM: spear: merge Kconfig files
  ARM: spear: make spear3xx/6xx mach/spear.h files identical
  ARM: spear: move identical headers to plat-spear/include/mach
  ARM: spear: unify mach/generic.h and mach/irqs.h
  ARM: spear13xx: make mach/dma.h local

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/Kconfig
index 9a95f7897baab97141595584ba08efc28eef2359,4b82c7bbef864781d46380bfb7287d496707aaf2..e2c7ecf0d1ca3f75dbb5b8f62c421236102e795b
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -905,18 -916,27 +905,6 @@@ config ARCH_U850
        help
          Support for ST-Ericsson's Ux500 architecture
  
- config PLAT_SPEAR
-       bool "ST SPEAr"
-       select ARCH_HAS_CPUFREQ
 -config ARCH_NOMADIK
 -      bool "STMicroelectronics Nomadik"
--      select ARCH_REQUIRE_GPIOLIB
--      select ARM_AMBA
-       select CLKDEV_LOOKUP
-       select CLKSRC_MMIO
 -      select ARM_VIC
 -      select CLKSRC_NOMADIK_MTU
--      select COMMON_CLK
 -      select CPU_ARM926T
--      select GENERIC_CLOCKEVENTS
-       select HAVE_CLK
 -      select MIGHT_HAVE_CACHE_L2X0
 -      select USE_OF
 -      select PINCTRL
 -      select PINCTRL_STN8815
 -      select SPARSE_IRQ
 -      help
 -        Support for the Nomadik platform by ST-Ericsson
 -
 -config PLAT_SPEAR_SINGLE
 -      bool "ST SPEAr"
--      help
--        Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).
  
  config ARCH_DAVINCI
        bool "TI DaVinci"