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

Conflicts:
	arch/arm/mach-exynos4/Kconfig

diff --combined arch/arm/mach-exynos4/Kconfig
index f4ec583,3ab0f18..c595bb0
--- 1/arch/arm/mach-exynos4/Kconfig
--- 2/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@ -15,14 -15,8 +15,14 @@@ config CPU_EXYNOS421
        help
          Enable EXYNOS4210 CPU support
  
 +config SOC_EXYNOS4212
 +      bool
 +      help
 +        Enable EXYNOS4212 SoC support
 +
  config EXYNOS4_MCT
 -      bool "Kernel timer support by MCT"
 +      bool
 +      default y
        help
          Use MCT (Multi Core Timer) as kernel timers
  
@@@ -31,11 -25,6 +31,11 @@@ config EXYNOS4_DEV_AHC
        help
          Compile in platform device definitions for AHCI
  
 +config EXYNOS4_SETUP_FIMD0
 +      bool
 +      help
 +        Common setup code for FIMD0.
 +
  config EXYNOS4_DEV_PD
        bool
        help
@@@ -46,11 -35,6 +46,11 @@@ config EXYNOS4_DEV_SYSMM
        help
          Common setup code for SYSTEM MMU in EXYNOS4
  
 +config EXYNOS4_DEV_DWMCI
 +      bool
 +      help
 +        Compile in platform device definitions for DWMCI
 +
  config EXYNOS4_SETUP_I2C1
        bool
        help
@@@ -116,18 -100,26 +116,18 @@@ config EXYNOS4_SETUP_USB_PH
  
  menu "EXYNOS4 Machines"
  
 +comment "EXYNOS4210 Boards"
 +
  config MACH_SMDKC210
        bool "SMDKC210"
 -      select CPU_EXYNOS4210
 -      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 EXYNOS4_DEV_PD
 -      select EXYNOS4_DEV_SYSMMU
 -      select EXYNOS4_SETUP_I2C1
 -      select EXYNOS4_SETUP_SDHCI
 +      select MACH_SMDKV310
        help
          Machine support for Samsung SMDKC210
  
  config MACH_SMDKV310
        bool "SMDKV310"
        select CPU_EXYNOS4210
 +      select S5P_DEV_FIMD0
        select S3C_DEV_RTC
        select S3C_DEV_WDT
        select S3C_DEV_I2C1
@@@ -135,13 -127,9 +135,13 @@@
        select S3C_DEV_HSMMC1
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
 +      select SAMSUNG_DEV_BACKLIGHT
 +      select EXYNOS4_DEV_AHCI
        select SAMSUNG_DEV_KEYPAD
        select EXYNOS4_DEV_PD
 +      select SAMSUNG_DEV_PWM
        select EXYNOS4_DEV_SYSMMU
 +      select EXYNOS4_SETUP_FIMD0
        select EXYNOS4_SETUP_I2C1
        select EXYNOS4_SETUP_KEYPAD
        select EXYNOS4_SETUP_SDHCI
@@@ -165,22 -153,13 +165,22 @@@ config MACH_ARMLEX421
  config MACH_UNIVERSAL_C210
        bool "Mobile UNIVERSAL_C210 Board"
        select CPU_EXYNOS4210
 +      select S5P_GPIO_INT
 +      select S5P_DEV_FIMC0
 +      select S5P_DEV_FIMC1
 +      select S5P_DEV_FIMC2
 +      select S5P_DEV_FIMC3
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
        select S3C_DEV_I2C1
 +      select S3C_DEV_I2C3
        select S3C_DEV_I2C5
 +      select S5P_DEV_MFC
        select S5P_DEV_ONENAND
 +      select EXYNOS4_DEV_PD
        select EXYNOS4_SETUP_I2C1
 +      select EXYNOS4_SETUP_I2C3
        select EXYNOS4_SETUP_I2C5
        select EXYNOS4_SETUP_SDHCI
        help
@@@ -197,42 -176,26 +197,52 @@@ config MACH_NUR
        select S3C_DEV_I2C1
        select S3C_DEV_I2C3
        select S3C_DEV_I2C5
 +      select S5P_DEV_MFC
        select S5P_DEV_USB_EHCI
 +      select EXYNOS4_DEV_PD
        select EXYNOS4_SETUP_I2C1
        select EXYNOS4_SETUP_I2C3
        select EXYNOS4_SETUP_I2C5
        select EXYNOS4_SETUP_SDHCI
        select EXYNOS4_SETUP_USB_PHY
        select SAMSUNG_DEV_PWM
 +      select SAMSUNG_DEV_ADC
        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 --combined arch/arm/mach-exynos4/Makefile
index 64ffad4,4b22dc5..e19cd12
--- 1/arch/arm/mach-exynos4/Makefile
--- 2/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@@ -12,39 -12,40 +12,40 @@@ obj-                               :
  
  # Core support for EXYNOS4 system
  
 -obj-$(CONFIG_CPU_EXYNOS4210)  += cpu.o init.o clock.o irq-combiner.o
 -obj-$(CONFIG_CPU_EXYNOS4210)  += setup-i2c0.o irq-eint.o dma.o
 +obj-$(CONFIG_ARCH_EXYNOS4)    += cpu.o init.o clock.o irq-combiner.o
 +obj-$(CONFIG_ARCH_EXYNOS4)    += setup-i2c0.o irq-eint.o dma.o pmu.o
 +obj-$(CONFIG_CPU_EXYNOS4210)  += clock-exynos4210.o
 +obj-$(CONFIG_SOC_EXYNOS4212)  += clock-exynos4212.o
  obj-$(CONFIG_PM)              += pm.o sleep.o
 -obj-$(CONFIG_CPU_FREQ)                += cpufreq.o
  obj-$(CONFIG_CPU_IDLE)                += cpuidle.o
  
  obj-$(CONFIG_SMP)             += platsmp.o headsmp.o
  
 -ifeq ($(CONFIG_EXYNOS4_MCT),y)
 -obj-y                         += mct.o
 -else
 -obj-y                         += time.o
 -obj-$(CONFIG_LOCAL_TIMERS)    += localtimer.o
 -endif
 +obj-$(CONFIG_EXYNOS4_MCT)     += mct.o
  
  obj-$(CONFIG_HOTPLUG_CPU)     += hotplug.o
  
  # machine support
  
 -obj-$(CONFIG_MACH_SMDKC210)           += mach-smdkc210.o
 +obj-$(CONFIG_MACH_SMDKC210)           += mach-smdkv310.o
  obj-$(CONFIG_MACH_SMDKV310)           += mach-smdkv310.o
  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
  obj-$(CONFIG_EXYNOS4_DEV_AHCI)                += dev-ahci.o
  obj-$(CONFIG_EXYNOS4_DEV_PD)          += dev-pd.o
  obj-$(CONFIG_EXYNOS4_DEV_SYSMMU)      += dev-sysmmu.o
 +obj-$(CONFIG_EXYNOS4_DEV_DWMCI)       += dev-dwmci.o
  
  obj-$(CONFIG_EXYNOS4_SETUP_FIMC)      += setup-fimc.o
 +obj-$(CONFIG_EXYNOS4_SETUP_FIMD0)     += setup-fimd0.o
  obj-$(CONFIG_EXYNOS4_SETUP_I2C1)      += setup-i2c1.o
  obj-$(CONFIG_EXYNOS4_SETUP_I2C2)      += setup-i2c2.o
  obj-$(CONFIG_EXYNOS4_SETUP_I2C3)      += setup-i2c3.o