Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
Russell King [Wed, 25 May 2011 20:47:48 +0000 (21:47 +0100)]
Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos4/mach-nuri.c

1  2 
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/Makefile
arch/arm/mach-exynos4/mach-nuri.c
arch/arm/plat-s5p/Kconfig
arch/arm/plat-samsung/include/plat/cpu.h
arch/arm/plat-samsung/include/plat/devs.h
sound/soc/samsung/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
Simple merge
@@@ -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
Simple merge
  #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));
  }
Simple merge
Simple merge