Merge branch 'next-samsung-devel' into for-next

Conflicts:
	arch/arm/mach-exynos4/Kconfig
	arch/arm/mach-exynos4/Makefile
	arch/arm/mach-exynos4/clock.c
	arch/arm/mach-exynos4/mach-origen.c
	arch/arm/mach-s5p64x0/dma.c

diff --cc arch/arm/mach-exynos4/Kconfig
index c595bb03f417c376350bf646df049447917cfcd5,0c7315b1b3149ec0fe48c1d4136d66efad073820..3b594fea66b0581c9941a26a363cb2d329037d81
--- 1/arch/arm/mach-exynos4/Kconfig
--- 2/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@ -213,10 -229,21 +221,21 @@@ config MACH_NUR
  config MACH_ORIGEN
        bool "ORIGEN"
        select CPU_EXYNOS4210
 -      select S3C_DEV_RTC
 -      select S3C_DEV_WDT
+       select S3C_DEV_HSMMC
+       select S3C_DEV_HSMMC2
 +      select S3C_DEV_RTC
 +      select S3C_DEV_WDT
-       select S3C_DEV_HSMMC2
+       select S5P_DEV_FIMC0
+       select S5P_DEV_FIMC1
+       select S5P_DEV_FIMC2
+       select S5P_DEV_FIMC3
+       select S5P_DEV_I2C_HDMIPHY
 -      select S5P_DEV_USB_EHCI
+       select S5P_DEV_TV
++      select S5P_DEV_USB_EHCI
+       select SAMSUNG_DEV_BACKLIGHT
+       select SAMSUNG_DEV_PWM
        select EXYNOS4_SETUP_SDHCI
+       select EXYNOS4_SETUP_USB_PHY
        help
          Machine support for ORIGEN based on Samsung EXYNOS4210
  

diff --cc arch/arm/mach-exynos4/clock.c
index f26aea3e1bbf331e46e7c1a63365cd65cc3f1ef9,c99ed1878699b266387b467835c2ba66abb4fd82..da9567adce7f030e83ef89bde82ef48a7dbe425c
--- 1/arch/arm/mach-exynos4/clock.c
--- 2/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
@@@ -1243,31 -1389,12 +1445,34 @@@ void __init_or_cpufreq exynos4_setup_cl
  }
  
  static struct clk *clks[] __initdata = {
-       /* Nothing here yet */
+       &clk_sclk_hdmi27m,
+       &clk_sclk_hdmiphy,
+       &clk_sclk_usbphy0,
+       &clk_sclk_usbphy1,
  };
  
 +#ifdef CONFIG_PM_SLEEP
 +static int exynos4_clock_suspend(void)
 +{
 +      s3c_pm_do_save(exynos4_clock_save, ARRAY_SIZE(exynos4_clock_save));
 +      return 0;
 +}
 +
 +static void exynos4_clock_resume(void)
 +{
 +      s3c_pm_do_restore_core(exynos4_clock_save, ARRAY_SIZE(exynos4_clock_save));
 +}
 +
 +#else
 +#define exynos4_clock_suspend NULL
 +#define exynos4_clock_resume NULL
 +#endif
 +
 +struct syscore_ops exynos4_clock_syscore_ops = {
 +      .suspend        = exynos4_clock_suspend,
 +      .resume         = exynos4_clock_resume,
 +};
 +
  void __init exynos4_register_clocks(void)
  {
        int ptr;
@@@ -1283,6 -1413,7 +1491,8 @@@
        s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
        s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
  
 +      register_syscore_ops(&exynos4_clock_syscore_ops);
+       s3c24xx_register_clock(&dummy_apb_pclk);
+ 
        s3c_pwmclk_init();
  }

diff --cc arch/arm/mach-exynos4/cpu.c
Simple merge

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

diff --cc arch/arm/mach-exynos4/mach-smdkv310.c
index a16eb569a3e69e06a161d57526629cf4ad66c69b,5f62b2b3310d495fbafa53016624fa96404cb12b..57cf63219e606835a7e9f4ccf4d8c5123d0eba2c
--- 1/arch/arm/mach-exynos4/mach-smdkv310.c
--- 2/arch/arm/mach-exynos4/mach-smdkv310.c
+++ b/arch/arm/mach-exynos4/mach-smdkv310.c
@@@ -316,9 -257,9 +325,10 @@@ static void __init smdkv310_machine_ini
        samsung_keypad_set_platdata(&smdkv310_keypad_data);
  
        samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data);
 +      s5p_fimd0_set_platdata(&smdkv310_lcd0_pdata);
  
        platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices));
+       s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
  }
  
  MACHINE_START(SMDKV310, "SMDKV310")
@@@ -329,13 -270,5 +339,14 @@@
        .map_io         = smdkv310_map_io,
        .init_machine   = smdkv310_machine_init,
        .timer          = &exynos4_timer,
+       .reserve        = &smdkv310_reserve,
  MACHINE_END
 +
 +MACHINE_START(SMDKC210, "SMDKC210")
 +      /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
 +      .boot_params    = S5P_PA_SDRAM + 0x100,
 +      .init_irq       = exynos4_init_irq,
 +      .map_io         = smdkv310_map_io,
 +      .init_machine   = smdkv310_machine_init,
 +      .timer          = &exynos4_timer,
 +MACHINE_END

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

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/dma.c
index 0e5b3e63e5b3f388382dc54cb68b31e05677b8f4,aebf3fcb1ebe19244833fee86a0f7a5bafa9ce92..442dd4ad12da61a02694e97923ca53386a7854ad
--- 1/arch/arm/mach-s5p64x0/dma.c
--- 2/arch/arm/mach-s5p64x0/dma.c
+++ b/arch/arm/mach-s5p64x0/dma.c
@@@ -27,10 -30,10 +30,11 @@@
  #include <mach/map.h>
  #include <mach/irqs.h>
  #include <mach/regs-clock.h>
+ #include <mach/dma.h>
  
 +#include <plat/cpu.h>
  #include <plat/devs.h>
- #include <plat/s3c-pl330-pdata.h>
+ #include <plat/irqs.h>
  
  static u64 dma_dmamask = DMA_BIT_MASK(32);
  

diff --cc arch/arm/mach-s5pv210/Kconfig
index aaeb44a73716349f5fa3e18a165b229ced31f18f,18f3a6815e5451e0e30fdff0ff981c2d591c7505..ccef03414c5720a26efaf2636251090e41b252e6
--- 1/arch/arm/mach-s5pv210/Kconfig
--- 2/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@@ -11,9 -11,10 +11,9 @@@ if ARCH_S5PV21
  
  config CPU_S5PV210
        bool
-       select S3C_PL330_DMA
+       select SAMSUNG_DMADEV
        select S5P_EXT_INT
        select S5P_HRT
 -      select S5PV210_PM if PM
        help
          Enable S5PV210 CPU support
  

diff --cc arch/arm/plat-s5p/include/plat/pll.h
Simple merge

diff --cc arch/arm/plat-samsung/Makefile
Simple merge

diff --cc arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
Simple merge