Merge branches 'next-samsung-cleanup', 'next-samsung-soc', 'next-samsung-board' and...

diff --cc arch/arm/mach-exynos4/Kconfig
index 0c77ab99fa16a754794ece0407b4dae95ee114da,bee8f77de2aba1b4844b2fc5e535d1b05a8c5b92,c595bb03f417c376350bf646df049447917cfcd5,bb29d51866b75a11c13080d4ed8a75906725b09b..48f18f71efdfd10c17607774e9b4156778d2ed34
--- 1/arch/arm/mach-exynos4/Kconfig
--- 2/arch/arm/mach-exynos4/Kconfig
--- 3/arch/arm/mach-exynos4/Kconfig
--- 4/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@@@ -111,24 -111,9 -116,11 -111,24 +116,11 @@@@@ config EXYNOS4_SETUP_USB_PH
    
    menu "EXYNOS4 Machines"
    
++ +comment "EXYNOS4210 Boards"
++ +
    config MACH_SMDKC210
        bool "SMDKC210"
-  -    select CPU_EXYNOS4210
-  -    select S5P_DEV_FIMD0
-  -    select S3C_DEV_RTC
-  -    select S3C_DEV_WDT
-  -    select S3C_DEV_I2C1
-  -    select S3C_DEV_HSMMC
-  -    select S3C_DEV_HSMMC1
-  -    select S3C_DEV_HSMMC2
-  -    select S3C_DEV_HSMMC3
-  -    select SAMSUNG_DEV_PWM
-  -    select SAMSUNG_DEV_BACKLIGHT
-  -    select EXYNOS4_DEV_PD
-  -    select EXYNOS4_DEV_SYSMMU
-  -    select EXYNOS4_SETUP_FIMD0
-  -    select EXYNOS4_SETUP_I2C1
-  -    select EXYNOS4_SETUP_SDHCI
+  +    select MACH_SMDKV310
        help
          Machine support for Samsung SMDKC210
    

diff --cc arch/arm/mach-exynos4/mach-smdkv310.c
index ea4149556860f45c471cff55891cf7fc051a6980,a16eb569a3e69e06a161d57526629cf4ad66c69b,a16eb569a3e69e06a161d57526629cf4ad66c69b,5f62b2b3310d495fbafa53016624fa96404cb12b..57cf63219e606835a7e9f4ccf4d8c5123d0eba2c
--- 1/arch/arm/mach-exynos4/mach-smdkv310.c
--- 2/arch/arm/mach-exynos4/mach-smdkv310.c
--- 3/arch/arm/mach-exynos4/mach-smdkv310.c
--- 4/arch/arm/mach-exynos4/mach-smdkv310.c
+++ b/arch/arm/mach-exynos4/mach-smdkv310.c
@@@@@ -248,8 -316,9 -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")
@@@@@ -260,4 -329,13 -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-exynos4/mach-universal_c210.c
Simple merge

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

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

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