From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 16 Sep 2011 08:13:09 +0000 (+0900)
Subject: Merge branch 'next-samsung-board-v3.1' into next-samsung-board
X-Git-Tag: next-20110920~97^2~2^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2520123382e97271e932377c83bca010c265be55;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/mach-exynos4/Kconfig
---

2520123382e97271e932377c83bca010c265be55
diff --cc arch/arm/mach-exynos4/Kconfig
index f4ec583ec948,3ab0f18c52a4..c595bb03f417
--- a/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 64ffad4fb04e,4b22dc531219..e19cd12d264e
--- a/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