From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 9 Apr 2013 13:54:16 +0000 (+0200)
Subject: Merge tag 'ux500-multiplatform-asoc' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9bc128e16bb82c046d6972171de572affc5c4cbf;p=linux-beck.git

Merge tag 'ux500-multiplatform-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/multiplatform

From Linus Walleij <linus.walleij@linaro.org>:

Ux500 multiplatform support.  This tag builds upon the MFD-specific base
tag "ux500-multiplatform-mfd". This removes all <mach/*> dependencies
and makes the ux500 fully multi-platform.

* tag 'ux500-multiplatform-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: build hotplug.o for ARMv7-a
  ARM: ux500: move to multiplatform
  ARM: ux500: make remaining headers local
  ARM: ux500: make irqs.h local to platform
  ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>
  staging: ste_rmi4: kill platform_data hack
  ARM: ux500: move mach/msp.h to <linux/platform_data/*>
  clk: ux500: pass clock base adresses in init call
  ARM: ux500: make debug macro stand-alone
  ARM: ux500: move debugmacro to debug includes
  ARM: ux500: split out prcmu initialization
  mfd: db8500-prcmu: drop unused includes
  ARM: ux500: move PM-related PRCMU functions to machine
  mfd: db8500-prcmu: get base address from resource
  mfd: prcmu: pass a base and size with the early initcall

Conflicts:
	arch/arm/Kconfig

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

9bc128e16bb82c046d6972171de572affc5c4cbf
diff --cc arch/arm/Kconfig
index 0036238d4b7a,6ece86ac14e0..8bca2f382e06
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -853,22 -900,36 +853,6 @@@ config ARCH_U30
  	help
  	  Support for ST-Ericsson U300 series mobile platforms.
  
- config ARCH_U8500
- 	bool "ST-Ericsson U8500 Series"
- 	depends on MMU
- 	select ARCH_HAS_CPUFREQ
 -config ARCH_NOMADIK
 -	bool "STMicroelectronics Nomadik"
--	select ARCH_REQUIRE_GPIOLIB
--	select ARM_AMBA
- 	select CLKDEV_LOOKUP
- 	select CPU_V7
 -	select ARM_VIC
 -	select CLKSRC_NOMADIK_MTU
 -	select COMMON_CLK
 -	select CPU_ARM926T
--	select GENERIC_CLOCKEVENTS
- 	select HAVE_SMP
--	select MIGHT_HAVE_CACHE_L2X0
 -	select USE_OF
 -	select PINCTRL
 -	select PINCTRL_STN8815
--	select SPARSE_IRQ
--	help
- 	  Support for ST-Ericsson's Ux500 architecture
 -	  Support for the Nomadik platform by ST-Ericsson
--
 -config PLAT_SPEAR
 -	bool "ST SPEAr"
 -	select ARCH_HAS_CPUFREQ
 -	select ARCH_REQUIRE_GPIOLIB
 -	select ARM_AMBA
 -	select CLKDEV_LOOKUP
 -	select CLKSRC_MMIO
 -	select COMMON_CLK
 -	select GENERIC_CLOCKEVENTS
 -	select HAVE_CLK
 -	help
 -	  Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).
--
  config ARCH_DAVINCI
  	bool "TI DaVinci"
  	select ARCH_HAS_HOLES_MEMORYMODEL