Merge branch 'next-s5pv310' into for-next

Conflicts:
	arch/arm/mach-s5pv310/Kconfig
	arch/arm/mach-s5pv310/Makefile
	arch/arm/mach-s5pv310/mach-smdkc210.c
	arch/arm/mach-s5pv310/mach-smdkv310.c
	arch/arm/plat-samsung/include/plat/devs.h

diff --cc arch/arm/mach-s5pv310/Kconfig
index 3e1fe9d6b1fa8107ff86ccf1c6990b49be9586db,e0cef3fd165ef2816e323e598049493ea08425e9..b7aa3cd2198af023b15d31dec738d8aff5b37041
--- 1/arch/arm/mach-s5pv310/Kconfig
--- 2/arch/arm/mach-s5pv310/Kconfig
+++ b/arch/arm/mach-s5pv310/Kconfig
@@@ -75,7 -78,7 +80,8 @@@ config MACH_SMDKC21
        select S3C_DEV_HSMMC1
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
+       select S5PV310_DEV_PD
 +      select S5PV310_SETUP_I2C1
        select S5PV310_SETUP_SDHCI
        help
          Machine support for Samsung SMDKC210
@@@ -105,7 -111,7 +115,8 @@@ config MACH_SMDKV31
        select S3C_DEV_HSMMC1
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
+       select S5PV310_DEV_PD
 +      select S5PV310_SETUP_I2C1
        select S5PV310_SETUP_SDHCI
        help
          Machine support for Samsung SMDKV310

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

diff --cc arch/arm/mach-s5pv310/include/mach/irqs.h
index 34f214444f27a324904af468149ef2878abcaf3a,f9a2830620d8990325335084a6e6ca2ce1a1ca9f..1dd130a3478277934c3a12742fe0400ee94cb18c
--- 1/arch/arm/mach-s5pv310/include/mach/irqs.h
--- 2/arch/arm/mach-s5pv310/include/mach/irqs.h
+++ b/arch/arm/mach-s5pv310/include/mach/irqs.h
@@@ -86,11 -84,10 +87,13 @@@
  #define IRQ_HSMMC2            COMBINER_IRQ(29, 2)
  #define IRQ_HSMMC3            COMBINER_IRQ(29, 3)
  
 +#define IRQ_MIPI_CSIS0                COMBINER_IRQ(30, 0)
 +#define IRQ_MIPI_CSIS1                COMBINER_IRQ(30, 1)
 +
  #define IRQ_ONENAND_AUDI      COMBINER_IRQ(34, 0)
  
+ #define IRQ_MCT_L1            COMBINER_IRQ(35, 3)
+ 
  #define IRQ_EINT4             COMBINER_IRQ(37, 0)
  #define IRQ_EINT5             COMBINER_IRQ(37, 1)
  #define IRQ_EINT6             COMBINER_IRQ(37, 2)

diff --cc arch/arm/mach-s5pv310/include/mach/map.h
Simple merge

diff --cc arch/arm/mach-s5pv310/mach-smdkc210.c
index f3bc283df1195e7c603ee4e379768a07cad25884,f65e668ceae9e0b6ed7b5b48f8a9bedfb2ccd5f7..9262966cd2690c56daab5b5672f7060f9efa9528
--- 1/arch/arm/mach-s5pv310/mach-smdkc210.c
--- 2/arch/arm/mach-s5pv310/mach-smdkc210.c
+++ b/arch/arm/mach-s5pv310/mach-smdkc210.c
@@@ -25,9 -23,10 +25,10 @@@
  #include <plat/cpu.h>
  #include <plat/devs.h>
  #include <plat/sdhci.h>
 +#include <plat/iic.h>
+ #include <plat/pd.h>
  
  #include <mach/map.h>
 -#include <mach/regs-srom.h>
  
  /* Following are default values for UCON, ULCON and UFCON UART registers */
  #define SMDKC210_UCON_DEFAULT (S3C2410_UCON_TXILEVEL |        \
@@@ -141,21 -140,21 +142,28 @@@ static struct platform_device smdkc210_
        },
  };
  
 +static struct i2c_board_info i2c_devs1[] __initdata = {
 +      {I2C_BOARD_INFO("wm8994", 0x1a),},
 +};
 +
  static struct platform_device *smdkc210_devices[] __initdata = {
-       &s3c_device_i2c1,
        &s3c_device_hsmmc0,
        &s3c_device_hsmmc1,
        &s3c_device_hsmmc2,
        &s3c_device_hsmmc3,
++      &s3c_device_i2c1,
        &s3c_device_rtc,
        &s3c_device_wdt,
--      &smdkc210_smsc911x,
 +      &s5pv310_device_ac97,
 +      &s5pv310_device_i2s0,
+       &s5pv310_device_pd[PD_MFC],
+       &s5pv310_device_pd[PD_G3D],
+       &s5pv310_device_pd[PD_LCD0],
+       &s5pv310_device_pd[PD_LCD1],
+       &s5pv310_device_pd[PD_CAM],
+       &s5pv310_device_pd[PD_TV],
+       &s5pv310_device_pd[PD_GPS],
++      &smdkc210_smsc911x,
  };
  
  static void __init smdkc210_smsc911x_init(void)

diff --cc arch/arm/mach-s5pv310/mach-smdkv310.c
index e4a826ac3c1de4b38b590856d04a86031475bd27,19aa3e3c011d103c639c9159bb348a5c8b78b904..3eb029ca2073a60a903191a9e9186909e0cc2ba7
--- 1/arch/arm/mach-s5pv310/mach-smdkv310.c
--- 2/arch/arm/mach-s5pv310/mach-smdkv310.c
+++ b/arch/arm/mach-s5pv310/mach-smdkv310.c
@@@ -25,9 -23,10 +25,10 @@@
  #include <plat/cpu.h>
  #include <plat/devs.h>
  #include <plat/sdhci.h>
 +#include <plat/iic.h>
+ #include <plat/pd.h>
  
  #include <mach/map.h>
 -#include <mach/regs-srom.h>
  
  /* Following are default values for UCON, ULCON and UFCON UART registers */
  #define SMDKV310_UCON_DEFAULT (S3C2410_UCON_TXILEVEL |        \
@@@ -141,21 -140,21 +142,28 @@@ static struct platform_device smdkv310_
        },
  };
  
 +static struct i2c_board_info i2c_devs1[] __initdata = {
 +      {I2C_BOARD_INFO("wm8994", 0x1a),},
 +};
 +
  static struct platform_device *smdkv310_devices[] __initdata = {
-       &s3c_device_i2c1,
        &s3c_device_hsmmc0,
        &s3c_device_hsmmc1,
        &s3c_device_hsmmc2,
        &s3c_device_hsmmc3,
++      &s3c_device_i2c1,
        &s3c_device_rtc,
        &s3c_device_wdt,
--      &smdkv310_smsc911x,
 +      &s5pv310_device_ac97,
 +      &s5pv310_device_i2s0,
+       &s5pv310_device_pd[PD_MFC],
+       &s5pv310_device_pd[PD_G3D],
+       &s5pv310_device_pd[PD_LCD0],
+       &s5pv310_device_pd[PD_LCD1],
+       &s5pv310_device_pd[PD_CAM],
+       &s5pv310_device_pd[PD_TV],
+       &s5pv310_device_pd[PD_GPS],
++      &smdkv310_smsc911x,
  };
  
  static void __init smdkv310_smsc911x_init(void)

diff --cc arch/arm/plat-samsung/include/plat/devs.h
index 94794c816b0ed8deaafbd6e5125f77fe8cacf1a8,4dad6e24e970b1de5b4a8e899f371b8bebecc3a0..165fa8496c9ea68c4711b09ba798d9e6fb7d75d1
--- 1/arch/arm/plat-samsung/include/plat/devs.h
--- 2/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@@ -96,15 -96,6 +96,16 @@@ extern struct platform_device s5pv210_d
  extern struct platform_device s5pv210_device_iis2;
  extern struct platform_device s5pv210_device_spdif;
  
 +extern struct platform_device s5pv310_device_ac97;
 +extern struct platform_device s5pv310_device_pcm0;
 +extern struct platform_device s5pv310_device_pcm1;
 +extern struct platform_device s5pv310_device_pcm2;
 +extern struct platform_device s5pv310_device_i2s0;
 +extern struct platform_device s5pv310_device_i2s1;
 +extern struct platform_device s5pv310_device_i2s2;
 +extern struct platform_device s5pv310_device_spdif;
++extern struct platform_device s5pv310_device_pd[];
 +
  extern struct platform_device s5p6442_device_pcm0;
  extern struct platform_device s5p6442_device_pcm1;
  extern struct platform_device s5p6442_device_iis0;