From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 19 Apr 2013 12:34:05 +0000 (+0200)
Subject: Merge branch 'samsung/exynos-multiplatform' into next/drivers
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0dc488e778069b208d09516c5f0793dc37023c8e;p=linux-beck.git

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

Merging this into the next/drivers branch avoids a number of
pointless conflicts with code changed here.

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

0dc488e778069b208d09516c5f0793dc37023c8e
diff --cc arch/arm/mach-exynos/Kconfig
index ef3b69a6277c,1d69c62fe3d8..a77db362a888
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -7,6 -7,20 +7,21 @@@
  
  # 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 COMMON_CLK
+ 	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"
@@@ -80,6 -96,25 +98,19 @@@ config SOC_EXYNOS544
  	help
  	  Enable EXYNOS5440 SoC support
  
 -config EXYNOS4_MCT
 -	bool
 -	default y
 -	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
diff --cc arch/arm/mach-exynos/common.c
index 939bda77defa,83bd3f0e1519..a3ab0ecc7c6a
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@@ -852,30 -880,4 +857,31 @@@ 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 6cb19c6aa9d6,8aae6816ebc2..77dd30af32f5
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@@ -23,9 -27,9 +27,9 @@@ config PLAT_S5
  	select GIC_NON_BANKED if ARCH_EXYNOS4
  	select NO_IOPORT
  	select PLAT_SAMSUNG
- 	select S3C_GPIO_TRACK
+ 	select S3C_GPIO_TRACK if PLAT_SAMSUNG_SINGLE
  	select S5P_GPIO_DRVSTR
 -	select SAMSUNG_CLKSRC
 +	select SAMSUNG_CLKSRC if !COMMON_CLK
  	select SAMSUNG_GPIOLIB_4BIT
  	select SAMSUNG_IRQ_VIC_TIMER
  	help