diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:54:16 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:01:52 -0400 |
| commit | 9bc128e16bb82c046d6972171de572affc5c4cbf (patch) | |
| tree | 7c6dbe7f69771e9563d39f3be8a4854bed30d861 /arch/arm/Kconfig | |
| parent | 835f9c38bbb4498c3d43b7466964bdadbb1fd244 (diff) | |
| parent | f6f1bdac9d3006e246e82672322dcd7e7e0863fd (diff) | |
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>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0036238d4b7a..8bca2f382e06 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -853,22 +853,6 @@ config ARCH_U300 | |||
| 853 | help | 853 | help |
| 854 | Support for ST-Ericsson U300 series mobile platforms. | 854 | Support for ST-Ericsson U300 series mobile platforms. |
| 855 | 855 | ||
| 856 | config ARCH_U8500 | ||
| 857 | bool "ST-Ericsson U8500 Series" | ||
| 858 | depends on MMU | ||
| 859 | select ARCH_HAS_CPUFREQ | ||
| 860 | select ARCH_REQUIRE_GPIOLIB | ||
| 861 | select ARM_AMBA | ||
| 862 | select CLKDEV_LOOKUP | ||
| 863 | select CPU_V7 | ||
| 864 | select GENERIC_CLOCKEVENTS | ||
| 865 | select HAVE_SMP | ||
| 866 | select MIGHT_HAVE_CACHE_L2X0 | ||
| 867 | select SPARSE_IRQ | ||
| 868 | help | ||
| 869 | Support for ST-Ericsson's Ux500 architecture | ||
| 870 | |||
| 871 | |||
| 872 | config ARCH_DAVINCI | 856 | config ARCH_DAVINCI |
| 873 | bool "TI DaVinci" | 857 | bool "TI DaVinci" |
| 874 | select ARCH_HAS_HOLES_MEMORYMODEL | 858 | select ARCH_HAS_HOLES_MEMORYMODEL |