Merge branch 'next-s3c64xx-device' into next-merged

Conflicts:

	arch/arm/mach-s3c2440/mach-at2440evb.c

diff --cc arch/arm/mach-s3c2412/mach-jive.c
Simple merge

diff --cc arch/arm/mach-s3c2440/mach-anubis.c
Simple merge

diff --cc arch/arm/mach-s3c2440/mach-at2440evb.c
index 4539b1d,55e07ae..0a6d0a5
--- 1/arch/arm/mach-s3c2440/mach-at2440evb.c
--- 2/arch/arm/mach-s3c2440/mach-at2440evb.c
+++ b/arch/arm/mach-s3c2440/mach-at2440evb.c
@@@ -205,11 -167,9 +206,11 @@@ static struct platform_device *at2440ev
        &s3c_device_usb,
        &s3c_device_wdt,
        &s3c_device_adc,
-       &s3c_device_i2c,
+       &s3c_device_i2c0,
        &s3c_device_rtc,
        &s3c_device_nand,
 +      &s3c_device_sdi,
 +      &s3c_device_lcd,
        &at2440evb_device_eth,
  };
  
@@@ -226,7 -184,7 +227,9 @@@ static void __init at2440evb_map_io(voi
  
  static void __init at2440evb_init(void)
  {
 +      s3c24xx_fb_set_platdata(&at2440evb_fb_info);
+       s3c_i2c0_set_platdata(NULL);
++
        platform_add_devices(at2440evb_devices, ARRAY_SIZE(at2440evb_devices));
  }
  

diff --cc arch/arm/mach-s3c6410/mach-smdk6410.c
index 9213a8b,ae3bd5c..3c4d471
--- 1/arch/arm/mach-s3c6410/mach-smdk6410.c
--- 2/arch/arm/mach-s3c6410/mach-smdk6410.c
+++ b/arch/arm/mach-s3c6410/mach-smdk6410.c
@@@ -62,8 -132,29 +132,27 @@@ static struct s3c_fb_platdata smdk6410_
  struct map_desc smdk6410_iodesc[] = {};
  
  static struct platform_device *smdk6410_devices[] __initdata = {
+ #ifdef CONFIG_SMDK6410_SD_CH0
+       &s3c_device_hsmmc0,
+ #endif
+ #ifdef CONFIG_SMDK6410_SD_CH1
+       &s3c_device_hsmmc1,
+ #endif
+       &s3c_device_i2c0,
+       &s3c_device_i2c1,
+       &s3c_device_fb,
+       &smdk6410_lcd_powerdev,
+ };
+ 
+ static struct i2c_board_info i2c_devs0[] __initdata = {
+       { I2C_BOARD_INFO("24c08", 0x50), },
+       { I2C_BOARD_INFO("WM8580", 0X1b), },
+ };
+ 
+ static struct i2c_board_info i2c_devs1[] __initdata = {
+       { I2C_BOARD_INFO("24c128", 0x57), },    /* Samsung S524AD0XD1 */
  };
  
 -extern void s3c64xx_init_io(struct map_desc *, int);
 -
  static void __init smdk6410_map_io(void)
  {
        s3c64xx_init_io(smdk6410_iodesc, ARRAY_SIZE(smdk6410_iodesc));

diff --cc arch/arm/plat-s3c/Kconfig
Simple merge

diff --cc arch/arm/plat-s3c24xx/Makefile
index a8cfdef,763d344..1e0767b
--- 1/arch/arm/plat-s3c24xx/Makefile
--- 2/arch/arm/plat-s3c24xx/Makefile
+++ b/arch/arm/plat-s3c24xx/Makefile
@@@ -31,8 -31,10 +31,11 @@@ obj-$(CONFIG_PM)            += sleep.
  obj-$(CONFIG_HAVE_PWM)                += pwm.o
  obj-$(CONFIG_S3C2410_CLOCK)   += s3c2410-clock.o
  obj-$(CONFIG_S3C2410_DMA)     += dma.o
 +obj-$(CONFIG_S3C24XX_ADC)     += adc.o
  
+ # device specific setup and/or initialisation
+ obj-$(CONFIG_ARCH_S3C2410)    += setup-i2c.o
+ 
  # SPI gpio central GPIO functions
  
  obj-$(CONFIG_S3C24XX_SPI_BUS0_GPE11_GPE12_GPE13) += spi-bus0-gpe11_12_13.o

diff --cc arch/arm/plat-s3c24xx/devs.c
Simple merge