Merge branch 'samsung/exynos-multiplatform' into next/drivers

This merges in the revert of multiplatform support for exynos.

Trivial conflicts on removed code. Also, needed to add "select COMMON_CLK"
to the non-multiplatform EXYNOS config option.

* samsung/exynos-multiplatform:
  Revert "ARM: exynos: enable multiplatform support"

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/Kconfig
index f59b687dc3258f5ca4338a55fa3a7427cea82e9e,13b739469c515cb93a8dff1cdf686583a3941c54..ccb6c0c715213d3fc8cb9166cfcecc7b338d3f7a
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -860,11 -853,18 +860,19 @@@ config ARCH_S5PV21
        help
          Samsung S5PV210/S5PC110 series based systems
  
- config ARCH_EXYNOS_SINGLE
+ config ARCH_EXYNOS
        bool "Samsung EXYNOS"
+       select ARCH_HAS_CPUFREQ
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_SPARSEMEM_ENABLE
+       select CLKDEV_LOOKUP
++      select COMMON_CLK
+       select CPU_V7
+       select GENERIC_CLOCKEVENTS
+       select HAVE_CLK
+       select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
+       select HAVE_S3C_RTC if RTC_CLASS
        select NEED_MACH_GPIO_H
        select NEED_MACH_MEMORY_H
        help

diff --cc arch/arm/mach-exynos/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos/Makefile
Simple merge

diff --cc arch/arm/mach-exynos/common.c
index a3ab0ecc7c6aab2448ebfbdf30d2f786857f00b0,d63d399c7bae2801e2c1e9f03590cfa13ad77674..939bda77defa0b06e25acabed748f676329f4096
--- 1/arch/arm/mach-exynos/common.c
--- 2/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@@ -857,31 -875,3 +852,30 @@@ static int __init exynos_init_irq_eint(
        return 0;
  }
  arch_initcall(exynos_init_irq_eint);
- #endif
 +
 +static struct resource exynos4_pmu_resource[] = {
 +      DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU),
 +      DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU1),
 +#if defined(CONFIG_SOC_EXYNOS4412)
 +      DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU2),
 +      DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU3),
 +#endif
 +};
 +
 +static struct platform_device exynos4_device_pmu = {
 +      .name           = "arm-pmu",
 +      .num_resources  = ARRAY_SIZE(exynos4_pmu_resource),
 +      .resource       = exynos4_pmu_resource,
 +};
 +
 +static int __init exynos_armpmu_init(void)
 +{
 +      if (!of_have_populated_dt()) {
 +              if (soc_is_exynos4210() || soc_is_exynos4212())
 +                      exynos4_device_pmu.num_resources = 2;
 +              platform_device_register(&exynos4_device_pmu);
 +      }
 +
 +      return 0;
 +}
 +arch_initcall(exynos_armpmu_init);

diff --cc arch/arm/plat-samsung/Kconfig
index 77dd30af32f5ecbaa5c28e38a65aee151bf59d05,a9d52167e16ecbd0184ac18c47112eaaaaba5362..6cb19c6aa9d68d5b4a3ee89c2d46fb163fbd810e
--- 1/arch/arm/plat-samsung/Kconfig
--- 2/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@@ -27,9 -23,9 +23,9 @@@ config PLAT_S5
        select GIC_NON_BANKED if ARCH_EXYNOS4
        select NO_IOPORT
        select PLAT_SAMSUNG
-       select S3C_GPIO_TRACK if PLAT_SAMSUNG_SINGLE
+       select S3C_GPIO_TRACK
        select S5P_GPIO_DRVSTR
 -      select SAMSUNG_CLKSRC
 +      select SAMSUNG_CLKSRC if !COMMON_CLK
        select SAMSUNG_GPIOLIB_4BIT
        select SAMSUNG_IRQ_VIC_TIMER
        help

diff --cc arch/arm/plat-samsung/Makefile
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge