diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 16:49:18 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 16:49:18 +0400 |
| commit | d61bd77ff1e7c7a0a381c6e656dbc07b37510f37 (patch) | |
| tree | 838f7b1c4d931814fbbc30643bb423f409e6daba /arch/arm/mach-s5pv210/Kconfig | |
| parent | f2b7e3c54a304677a1142829fb5913595885379f (diff) | |
| parent | 1c739c7f374f77c5a355273c0c1d9345ed08c0ce (diff) | |
| download | linux-d61bd77ff1e7c7a0a381c6e656dbc07b37510f37.tar.xz | |
Merge branch 'next-samsung' into for-next
Conflicts:
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5p6442/Kconfig
arch/arm/mach-s5pc100/Kconfig
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/cpu.c
arch/arm/plat-samsung/include/plat/sdhci.h
Diffstat (limited to 'arch/arm/mach-s5pv210/Kconfig')
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 9b84abf1a822..ea9d147d4585 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig @@ -53,19 +53,24 @@ config S5PV210_SETUP_SDHCI_GPIO help Common setup code for SDHCI gpio. +config S5PC110_DEV_ONENAND + bool + help + Compile in platform device definition for OneNAND1 controller + menu "S5PC110 Machines" config MACH_AQUILA bool "Aquila" select CPU_S5PV210 select ARCH_SPARSEMEM_ENABLE - select S5PV210_SETUP_FB_24BPP - select S5PV210_SETUP_SDHCI select S3C_DEV_FB - select S5PC110_DEV_ONENAND select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 + select S5PC110_DEV_ONENAND + select S5PV210_SETUP_FB_24BPP + select S5PV210_SETUP_SDHCI help Machine support for the Samsung Aquila target based on S5PC110 SoC @@ -73,13 +78,13 @@ config MACH_GONI bool "GONI" select CPU_S5PV210 select ARCH_SPARSEMEM_ENABLE - select S5PV210_SETUP_FB_24BPP - select S5PV210_SETUP_SDHCI select S3C_DEV_FB - select S5PC110_DEV_ONENAND select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 + select S5PC110_DEV_ONENAND + select S5PV210_SETUP_FB_24BPP + select S5PV210_SETUP_SDHCI help Machine support for Samsung GONI board S5PC110(MCP) is one of package option of S5PV210 @@ -90,11 +95,9 @@ config MACH_SMDKC110 select ARCH_SPARSEMEM_ENABLE select S3C_DEV_I2C1 select S3C_DEV_I2C2 - select SAMSUNG_DEV_IDE select S3C_DEV_RTC select S3C_DEV_WDT - select HAVE_S3C_RTC - select HAVE_S3C2410_WATCHDOG + select SAMSUNG_DEV_IDE select S5PV210_SETUP_I2C1 select S5PV210_SETUP_I2C2 select S5PV210_SETUP_IDE @@ -104,31 +107,24 @@ config MACH_SMDKC110 endmenu -config S5PC110_DEV_ONENAND - bool - help - Compile in platform device definition for OneNAND1 controller - menu "S5PV210 Machines" config MACH_SMDKV210 bool "SMDKV210" select CPU_S5PV210 select ARCH_SPARSEMEM_ENABLE - select SAMSUNG_DEV_ADC select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC3 select S3C_DEV_I2C1 select S3C_DEV_I2C2 + select S3C_DEV_RTC + select S3C_DEV_WDT + select SAMSUNG_DEV_ADC select SAMSUNG_DEV_IDE select SAMSUNG_DEV_KEYPAD select SAMSUNG_DEV_TS - select S3C_DEV_RTC - select S3C_DEV_WDT - select HAVE_S3C_RTC - select HAVE_S3C2410_WATCHDOG select S5PV210_SETUP_I2C1 select S5PV210_SETUP_I2C2 select S5PV210_SETUP_IDE |