diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 07:18:36 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 07:18:36 -0400 |
| commit | db3c94a7edc6b29f8d52ba5884dec6a15feeadad (patch) | |
| tree | ac9207a44cecafb9104ca4e1f46aecb9fe01383d /arch/arm/mach-s5p64x0/Kconfig | |
| parent | c9477f38cba225870862fd9e08868ae3d4abdfe0 (diff) | |
| parent | 568f0e278c6dd33dc11bd19c4ad781d1f8d86800 (diff) | |
Merge branch 'next-samsung-devel' into next-samsung-devel-2
Conflicts:
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s3c2412/gpio.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5p64x0/gpiolib.c
Diffstat (limited to 'arch/arm/mach-s5p64x0/Kconfig')
| -rw-r--r-- | arch/arm/mach-s5p64x0/Kconfig | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig index 65c7518dad7f..e361c41314e9 100644 --- a/arch/arm/mach-s5p64x0/Kconfig +++ b/arch/arm/mach-s5p64x0/Kconfig | |||
| @@ -9,18 +9,24 @@ if ARCH_S5P64X0 | |||
| 9 | 9 | ||
| 10 | config CPU_S5P6440 | 10 | config CPU_S5P6440 |
| 11 | bool | 11 | bool |
| 12 | select S3C_PL330_DMA | 12 | select SAMSUNG_DMADEV |
| 13 | select S5P_HRT | 13 | select S5P_HRT |
| 14 | help | 14 | help |
| 15 | Enable S5P6440 CPU support | 15 | Enable S5P6440 CPU support |
| 16 | 16 | ||
| 17 | config CPU_S5P6450 | 17 | config CPU_S5P6450 |
| 18 | bool | 18 | bool |
| 19 | select S3C_PL330_DMA | 19 | select SAMSUNG_DMADEV |
| 20 | select S5P_HRT | 20 | select S5P_HRT |
| 21 | help | 21 | help |
| 22 | Enable S5P6450 CPU support | 22 | Enable S5P6450 CPU support |
| 23 | 23 | ||
| 24 | config S5P64X0_SETUP_FB_24BPP | ||
| 25 | bool | ||
| 26 | help | ||
| 27 | Common setup code for S5P64X0 based boards with a LCD display | ||
| 28 | through RGB interface. | ||
| 29 | |||
| 24 | config S5P64X0_SETUP_I2C1 | 30 | config S5P64X0_SETUP_I2C1 |
| 25 | bool | 31 | bool |
| 26 | help | 32 | help |
| @@ -31,6 +37,7 @@ config S5P64X0_SETUP_I2C1 | |||
| 31 | config MACH_SMDK6440 | 37 | config MACH_SMDK6440 |
| 32 | bool "SMDK6440" | 38 | bool "SMDK6440" |
| 33 | select CPU_S5P6440 | 39 | select CPU_S5P6440 |
| 40 | select S3C_DEV_FB | ||
| 34 | select S3C_DEV_I2C1 | 41 | select S3C_DEV_I2C1 |
| 35 | select S3C_DEV_RTC | 42 | select S3C_DEV_RTC |
| 36 | select S3C_DEV_WDT | 43 | select S3C_DEV_WDT |
| @@ -39,6 +46,7 @@ config MACH_SMDK6440 | |||
| 39 | select SAMSUNG_DEV_BACKLIGHT | 46 | select SAMSUNG_DEV_BACKLIGHT |
| 40 | select SAMSUNG_DEV_PWM | 47 | select SAMSUNG_DEV_PWM |
| 41 | select SAMSUNG_DEV_TS | 48 | select SAMSUNG_DEV_TS |
| 49 | select S5P64X0_SETUP_FB_24BPP | ||
| 42 | select S5P64X0_SETUP_I2C1 | 50 | select S5P64X0_SETUP_I2C1 |
| 43 | help | 51 | help |
| 44 | Machine support for the Samsung SMDK6440 | 52 | Machine support for the Samsung SMDK6440 |
| @@ -46,6 +54,7 @@ config MACH_SMDK6440 | |||
| 46 | config MACH_SMDK6450 | 54 | config MACH_SMDK6450 |
| 47 | bool "SMDK6450" | 55 | bool "SMDK6450" |
| 48 | select CPU_S5P6450 | 56 | select CPU_S5P6450 |
| 57 | select S3C_DEV_FB | ||
| 49 | select S3C_DEV_I2C1 | 58 | select S3C_DEV_I2C1 |
| 50 | select S3C_DEV_RTC | 59 | select S3C_DEV_RTC |
| 51 | select S3C_DEV_WDT | 60 | select S3C_DEV_WDT |
| @@ -54,6 +63,7 @@ config MACH_SMDK6450 | |||
| 54 | select SAMSUNG_DEV_BACKLIGHT | 63 | select SAMSUNG_DEV_BACKLIGHT |
| 55 | select SAMSUNG_DEV_PWM | 64 | select SAMSUNG_DEV_PWM |
| 56 | select SAMSUNG_DEV_TS | 65 | select SAMSUNG_DEV_TS |
| 66 | select S5P64X0_SETUP_FB_24BPP | ||
| 57 | select S5P64X0_SETUP_I2C1 | 67 | select S5P64X0_SETUP_I2C1 |
| 58 | help | 68 | help |
| 59 | Machine support for the Samsung SMDK6450 | 69 | Machine support for the Samsung SMDK6450 |