samsung update 1

1 files changed, 88 insertions, 1 deletions

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 4d79519..8c0b49f 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -15,6 +15,17 @@ config PLAT_SAMSUNG
 
 if PLAT_SAMSUNG
 
+# vmalloc area and io map configurations
+
+comment "Base Address for SFR mapping"
+
+config S3C_ADDR_BASE
+	hex "S3C Base Address for SFR mapping"
+	default 0xF6000000
+	help
+	  This value will be base address for S3C SFR mapping and
+	  VMALLC_END should be less or euqal to this value.
+
 # boot configurations
 
 comment "Boot options"
@@ -149,6 +160,23 @@ config S3C_ADC
 	  Core support for the ADC block found in the Samsung SoC systems
 	  for drivers such as the touchscreen and hwmon to use to share
 	  this resource.
+choice
+	prompt "Select ADC Number"
+	depends on S3C_ADC
+	default S3C_DEV_ADC
+
+config S3C_DEV_ADC
+	bool "ADC 0 selection"
+	depends on S3C_ADC
+	help
+	  Say Y here if you want to use S3C SMDK ADC 0.
+
+config S3C_DEV_ADC1
+	bool "ADC 1 selection"
+	depends on S3C_ADC
+	help
+	  Say Y here if you want to use S3C SMDK ADC 1.
+endchoice
 
 # device definitions to compile in
 
@@ -172,6 +200,11 @@ config S3C_DEV_HSMMC3
 	help
 	  Compile in platform device definitions for HSMMC channel 3
 
+config EXYNOS4_DEV_MSHC
+	bool
+	help
+	  Compile in platform device definitions for MSHC
+
 config S3C_DEV_HWMON
 	bool
 	help
@@ -212,6 +245,36 @@ config S3C_DEV_I2C7
 	help
 	  Compile in platform device definition for I2C controller 7
 
+config S3C_DEV_I2C8_EMUL
+	depends on CPU_EXYNOS4210
+	bool "I2C8 Information GPIO bitbanging emulation"
+	help
+	  Compile in platform device definitions for I2C channel 8
+
+config S3C_DEV_I2C9_EMUL
+	bool "I2C9 Information GPIO bitbanging emulation"
+	depends on CPU_EXYNOS4210
+	help
+	  Compile in platform device definitions for I2C channel 9
+
+config S3C_DEV_I2C11_EMUL
+	bool "I2C11 Information GPIO bitbanging emulation"
+	depends on CPU_EXYNOS4210
+	help
+	  Compile in platform device definitions for I2C channel 11
+
+config S3C_DEV_I2C14_EMUL
+	bool "I2C14 Information GPIO bitbanging emulation"
+	depends on CPU_EXYNOS4210
+	help
+	  Compile in platform device definitions for I2C channel 14
+
+config S3C_DEV_I2C16_EMUL
+	bool "I2C16 Information GPIO bitbanging emulation"
+	depends on CPU_EXYNOS4210
+	help
+	  Compile in platform device definitions for I2C channel 16
+
 config S3C_DEV_FB
 	bool
 	help
@@ -227,6 +290,12 @@ config S3C_DEV_USB_HSOTG
 	help
 	  Compile in platform device definition for USB high-speed OtG
 
+config EXYNOS_DEV_SS_UDC
+	bool
+	help
+	  Compile in platform device definition for EXYNOS SuperSpeed USB 3.0
+	  Device controller
+
 config S3C_DEV_WDT
 	bool
 	default y if ARCH_S3C2410
@@ -260,6 +329,7 @@ config SAMSUNG_DEV_IDE
 
 config S3C64XX_DEV_SPI
 	bool
+	default y if SPI_S3C64XX
 	help
 	  Compile in platform device definitions for S3C64XX's type
 	  SPI controllers.
@@ -267,7 +337,12 @@ config S3C64XX_DEV_SPI
 config SAMSUNG_DEV_TS
 	bool
 	help
-	    Common in platform device definitions for touchscreen device
+	  Common in platform device definitions for touchscreen device
+
+config SAMSUNG_DEV_TS1
+	bool
+	help
+	  Common in platform device definitions for touchscreen-1 device
 
 config SAMSUNG_DEV_KEYPAD
 	bool
@@ -280,6 +355,12 @@ config SAMSUNG_DEV_PWM
 	help
 	  Compile in platform device definition for PWM Timer
 
+config SAMSUNG_DEV_BACKLIGHT
+	bool
+	depends on SAMSUNG_DEV_PWM
+	help
+	  Compile in platform device definition LCD backlight with PWM Timer
+
 config S3C24XX_PWM
 	bool "PWM device support"
 	select HAVE_PWM
@@ -300,6 +381,12 @@ config S3C_PL330_DMA
 	help
 	  S3C DMA API Driver for PL330 DMAC.
 
+config DMA_M2M_TEST
+	tristate "S3C DMA API Test client"
+	help
+	  Samsung DMA API test client. Say N unless you're debugging a
+	  DMA Device driver.
+
 comment "Power management"
 
 config SAMSUNG_PM_DEBUG