From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 25 May 2011 20:47:48 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... 
X-Git-Tag: v3.0-rc1~34^2^2~1
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=586893ebc42943008010b4c210cfc9167df615e5;p=cascardo%2Flinux.git

Merge branch 'for-rmk' of git://git./linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-exynos4/mach-nuri.c
---

586893ebc42943008010b4c210cfc9167df615e5
diff --cc arch/arm/Kconfig
index 3bc1a58cc7d8,e81c72c38fed..f7cce8b75f49
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -2028,7 -1998,7 +2016,7 @@@ menu "Power management options
  source "kernel/power/Kconfig"
  
  config ARCH_SUSPEND_POSSIBLE
- 	depends on !ARCH_S5P64X0 && !ARCH_S5P6442 && !ARCH_S5PC100
 -	depends on !ARCH_S5P64X0
++	depends on !ARCH_S5P64X0 && !ARCH_S5PC100
  	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \
  		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE
  	def_bool y
diff --cc arch/arm/mach-exynos4/Kconfig
index 805196207ce8,11b57a4d53fa..b92c1e557145
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@ -169,9 -169,10 +169,11 @@@ config MACH_NUR
  	select S3C_DEV_HSMMC2
  	select S3C_DEV_HSMMC3
  	select S3C_DEV_I2C1
+ 	select S3C_DEV_I2C3
  	select S3C_DEV_I2C5
 +	select S5P_DEV_USB_EHCI
  	select EXYNOS4_SETUP_I2C1
+ 	select EXYNOS4_SETUP_I2C3
  	select EXYNOS4_SETUP_I2C5
  	select EXYNOS4_SETUP_SDHCI
  	select SAMSUNG_DEV_PWM
diff --cc arch/arm/mach-exynos4/mach-nuri.c
index bb5d12f43af8,d13c5e81c6a4..642702bb5b12
--- a/arch/arm/mach-exynos4/mach-nuri.c
+++ b/arch/arm/mach-exynos4/mach-nuri.c
@@@ -30,8 -31,8 +31,10 @@@
  #include <plat/cpu.h>
  #include <plat/devs.h>
  #include <plat/sdhci.h>
 +#include <plat/ehci.h>
 +#include <plat/clock.h>
+ #include <plat/gpio-cfg.h>
+ #include <plat/iic.h>
  
  #include <mach/map.h>
  
@@@ -282,7 -355,7 +367,8 @@@ static struct platform_device *nuri_dev
  	&s3c_device_hsmmc3,
  	&s3c_device_wdt,
  	&s3c_device_timer[0],
 +	&s5p_device_ehci,
+ 	&s3c_device_i2c3,
  
  	/* NURI Devices */
  	&nuri_gpio_keys,
@@@ -300,13 -373,13 +386,16 @@@ static void __init nuri_map_io(void
  static void __init nuri_machine_init(void)
  {
  	nuri_sdhci_init();
+ 	nuri_tsp_init();
  
  	i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));
+ 	s3c_i2c3_set_platdata(&i2c3_data);
+ 	i2c_register_board_info(3, i2c3_devs, ARRAY_SIZE(i2c3_devs));
  	i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs));
  
 +	nuri_ehci_init();
 +	clk_xusbxti.rate = 24000000;
 +
  	/* Last */
  	platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
  }