Merge branch 'next-samsung-board-v3.1' into next-samsung-board

Conflicts:
	arch/arm/mach-exynos4/Kconfig

diff --cc arch/arm/mach-exynos4/Kconfig
index f4ec583ec948f2a1e12e0aa025d9c0ba3b74e4b9,3ab0f18c52a4f3c75c2859d4c70cd3701b217500..c595bb03f417c376350bf646df049447917cfcd5
--- 1/arch/arm/mach-exynos4/Kconfig
--- 2/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@ -210,29 -186,16 +210,39 @@@ config MACH_NUR
        help
          Machine support for Samsung Mobile NURI Board.
  
+ config MACH_ORIGEN
+       bool "ORIGEN"
+       select CPU_EXYNOS4210
+       select S3C_DEV_RTC
+       select S3C_DEV_WDT
+       select S3C_DEV_HSMMC2
+       select EXYNOS4_SETUP_SDHCI
+       help
+         Machine support for ORIGEN based on Samsung EXYNOS4210
+ 
 +comment "EXYNOS4212 Boards"
 +
 +config MACH_SMDK4212
 +      bool "SMDK4212"
 +      select SOC_EXYNOS4212
 +      select S3C_DEV_HSMMC2
 +      select S3C_DEV_HSMMC3
 +      select S3C_DEV_I2C1
 +      select S3C_DEV_I2C3
 +      select S3C_DEV_I2C7
 +      select S3C_DEV_RTC
 +      select S3C_DEV_WDT
 +      select SAMSUNG_DEV_BACKLIGHT
 +      select SAMSUNG_DEV_KEYPAD
 +      select SAMSUNG_DEV_PWM
 +      select EXYNOS4_SETUP_I2C1
 +      select EXYNOS4_SETUP_I2C3
 +      select EXYNOS4_SETUP_I2C7
 +      select EXYNOS4_SETUP_KEYPAD
 +      select EXYNOS4_SETUP_SDHCI
 +      help
 +        Machine support for Samsung SMDK4212
 +
  endmenu
  
  comment "Configuration for HSMMC bus width"

diff --cc arch/arm/mach-exynos4/Makefile
index 64ffad4fb04e12a27191d311caacbe4a92e67f8f,4b22dc5312196a68ee7a9a27337a94bc0eb052cd..e19cd12d264e11f772316d4e145f9a0289d4b25c
--- 1/arch/arm/mach-exynos4/Makefile
--- 2/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@@ -32,9 -36,8 +32,10 @@@ obj-$(CONFIG_MACH_SMDKV310)          += mach-sm
  obj-$(CONFIG_MACH_ARMLEX4210)         += mach-armlex4210.o
  obj-$(CONFIG_MACH_UNIVERSAL_C210)     += mach-universal_c210.o
  obj-$(CONFIG_MACH_NURI)                       += mach-nuri.o
+ obj-$(CONFIG_MACH_ORIGEN)             += mach-origen.o
  
 +obj-$(CONFIG_MACH_SMDK4212)           += mach-smdk4212.o
 +
  # device support
  
  obj-y                                 += dev-audio.o