diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 07:35:57 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 08:33:09 -0400 |
commit | 56b690481c4baed815b9e4acf5ea89eadb58ba17 (patch) | |
tree | a543108af0789de129150ec4662230eeafeae877 /arch/arm/Kconfig | |
parent | 408e713545ca0bebe6034935c65e7e95c70d253b (diff) | |
parent | bd51de53e1be9896d815bbea30560262216d4616 (diff) |
Merge branch 'samsung/exynos-multiplatform' into next/multiplatform
These patches get us closer to adding multiplatform support on
the Exynos platform, they are part of a longer series of
patches. This would get all the simple stuff out of the
way, and I don't think there is a big risk of introducing
regressions with these.
A lot of the other patches have already been merged into
subsystem trees. After this series in in arm-soc, what is
left comes down to
* The ASoC conversion to dmaengine won't make it unless someone
who knows that code better steps up to do it right away. This
means that we won't have audio in a 3.10 multiplatform kernel
on Exynos, but it will still work for users that don't enable
multiplatform.
* The irqchip (combiner), clk and clksource patches are all based
on top of other changesets we pulled in from your trees, so I
would not make them part of the next/multiplatform branch. We can
apply them on top of the next/drivers branch once they are
tested successfully.
* A trivial patch is needed in the end to actually make
CONFIG_ARCH_EXYNOS visible in multiplatform configurations.
We will do that as a separate patch once everything else is
there.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 88b662d4618d..21a48d1bde43 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -776,18 +776,11 @@ config ARCH_S5PV210 | |||
776 | help | 776 | help |
777 | Samsung S5PV210/S5PC110 series based systems | 777 | Samsung S5PV210/S5PC110 series based systems |
778 | 778 | ||
779 | config ARCH_EXYNOS | 779 | config ARCH_EXYNOS_SINGLE |
780 | bool "Samsung EXYNOS" | 780 | bool "Samsung EXYNOS" |
781 | select ARCH_HAS_CPUFREQ | ||
782 | select ARCH_HAS_HOLES_MEMORYMODEL | 781 | select ARCH_HAS_HOLES_MEMORYMODEL |
783 | select ARCH_SPARSEMEM_ENABLE | 782 | select ARCH_SPARSEMEM_ENABLE |
784 | select CLKDEV_LOOKUP | ||
785 | select CPU_V7 | ||
786 | select GENERIC_CLOCKEVENTS | ||
787 | select HAVE_CLK | ||
788 | select HAVE_S3C2410_I2C if I2C | ||
789 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | 783 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
790 | select HAVE_S3C_RTC if RTC_CLASS | ||
791 | select NEED_MACH_GPIO_H | 784 | select NEED_MACH_GPIO_H |
792 | select NEED_MACH_MEMORY_H | 785 | select NEED_MACH_MEMORY_H |
793 | help | 786 | help |