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>

1 files changed, 36 insertions, 4 deletions

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 54cf73e7a791..9cfbb33a9eea 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -7,6 +7,20 @@
 
 # Configuration options for the EXYNOS4
 
+config ARCH_EXYNOS
+        # TODO: make this visible after all drivers are converted
+        bool "Samsung EXYNOS" if ARCH_MULTI_V7 && BROKEN
+        default ARCH_EXYNOS_SINGLE
+        select ARCH_HAS_CPUFREQ
+        select CLKDEV_LOOKUP
+        select CPU_V7
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CLK
+        select HAVE_S3C2410_I2C if I2C
+        select HAVE_S3C_RTC if RTC_CLASS
+        help
+          Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)
+
 if ARCH_EXYNOS
 
 menu "SAMSUNG EXYNOS SoCs Support"
@@ -20,6 +34,9 @@ config ARCH_EXYNOS4
         help
           Samsung EXYNOS4 SoCs based systems
 
+config ARCH_EXYNOS4_SINGLE
+        def_bool ARCH_EXYNOS4 && ARCH_EXYNOS_SINGLE
+
 config ARCH_EXYNOS5
         bool "SAMSUNG EXYNOS5"
         select HAVE_ARM_SCU if SMP
@@ -37,7 +54,7 @@ config CPU_EXYNOS4210
         select PM_GENERIC_DOMAINS
         select S5P_PM if PM
         select S5P_SLEEP if PM
-        select SAMSUNG_DMADEV
+        select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
         help
           Enable EXYNOS4210 CPU support
 
@@ -47,7 +64,7 @@ config SOC_EXYNOS4212
         depends on ARCH_EXYNOS4
         select S5P_PM if PM
         select S5P_SLEEP if PM
-        select SAMSUNG_DMADEV
+        select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
         help
           Enable EXYNOS4212 SoC support
 
@@ -55,7 +72,7 @@ config SOC_EXYNOS4412
         bool "SAMSUNG EXYNOS4412"
         default y
         depends on ARCH_EXYNOS4
-        select SAMSUNG_DMADEV
+        select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
         help
           Enable EXYNOS4412 SoC support
 
@@ -66,7 +83,7 @@ config SOC_EXYNOS5250
         select S5P_PM if PM
         select S5P_SLEEP if PM
         select S5P_DEV_MFC
-        select SAMSUNG_DMADEV
+        select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
         help
           Enable EXYNOS5250 SoC support
 
@@ -87,6 +104,19 @@ config EXYNOS4_MCT
         help
           Use MCT (Multi Core Timer) as kernel timers
 
+config EXYNOS_ATAGS
+        bool "ATAGS based boot for EXYNOS (deprecated)"
+        depends on !ARCH_MULTIPLATFORM
+        depends on ATAGS
+        default y
+        help
+          The EXYNOS platform is moving towards being completely probed
+          through device tree. This enables support for board files using
+          the traditional ATAGS boot format.
+          Note that this option is not available for multiplatform builds.
+
+if EXYNOS_ATAGS
+
 config EXYNOS_DEV_DMA
         bool
         help
@@ -402,6 +432,8 @@ config MACH_SMDK4412
           Machine support for Samsung SMDK4412
 endif
 
+endif
+
 comment "Flattened Device Tree based board for EXYNOS SoCs"
 
 config MACH_EXYNOS4_DT