diff options
| author | Jaecheol Lee <jc.lee@samsuung.com> | 2010-08-03 17:12:06 +0900 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2011-11-16 21:48:26 -0800 |
| commit | 8ac80edeefab65a0f1fecaaf744a37eec2e27817 (patch) | |
| tree | 357a0643f7b47cf264bd078325735e00633f6861 /arch | |
| parent | ecbda1c869b1b11dd0e23400815b8e6efd304683 (diff) | |
| download | kernel_samsung_crespo-8ac80edeefab65a0f1fecaaf744a37eec2e27817.zip kernel_samsung_crespo-8ac80edeefab65a0f1fecaaf744a37eec2e27817.tar.gz kernel_samsung_crespo-8ac80edeefab65a0f1fecaaf744a37eec2e27817.tar.bz2 | |
S5PC110: HERRING: Support PWM for HERRING and fixup default configuration.
Add support PWM and android pmem configuration for HERRING.
Change-Id: I02a2fed0b8cdb01c8bcecc972d37245917f85520
Signed-off-by: Jaecheol Lee <jc.lee@samsung.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 17 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-herring.c | 13 |
2 files changed, 28 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 607560d..85e7433 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig @@ -184,6 +184,8 @@ config MACH_S5PC110_CRESPO select S3C_DEV_I2C1 select S3C_DEV_I2C2 select S5P_DEV_ONENAND + select HAVE_PWM + select SAMSUNG_DEV_PWM select S5P_DEV_CSIS0 select S5P_SETUP_MIPIPHY help @@ -218,4 +220,19 @@ config S5PV210_SETUP_FIMC2 help Common setup code for FIMC controller 2. +config ANDROID_PMEM_MEMSIZE_PMEM + int "ANDROID PMEM support for CRESPO" + depends on ANDROID_PMEM + default "16384" + +config ANDROID_PMEM_MEMSIZE_PMEM_GPU1 + int "ANDROID PMEM support for CRESPO GPU" + depends on ANDROID_PMEM + default "10240" + +config ANDROID_PMEM_MEMSIZE_PMEM_ADSP + int "ANDROID PMEM support for CRESPO ADSP" + depends on ANDROID_PMEM + default "1024" + endif diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c index f4813ba..fb431b8 100644 --- a/arch/arm/mach-s5pv210/mach-herring.c +++ b/arch/arm/mach-s5pv210/mach-herring.c @@ -21,6 +21,7 @@ #include <linux/delay.h> #include <linux/spi/spi.h> #include <linux/spi/spi_gpio.h> +#include <linux/pwm_backlight.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -1219,7 +1220,7 @@ static struct s3c_platform_fimc fimc_plat = { }; #endif -#if defined(CONFIG_HAVE_PWM) +#if defined(CONFIG_BACKLIGHT_PWM) static struct platform_pwm_backlight_data smdk_backlight_data = { .pwm_id = 3, .max_brightness = 255, @@ -2778,6 +2779,13 @@ static struct platform_device *herring_devices[] __initdata = { &pmem_gpu1_device, &pmem_adsp_device, #endif + +#ifdef CONFIG_HAVE_PWM + &s3c_device_timer[0], + &s3c_device_timer[1], + &s3c_device_timer[2], + &s3c_device_timer[3], +#endif }; unsigned int HWREV=0; @@ -3093,7 +3101,8 @@ static void __init herring_machine_init(void) #ifdef CONFIG_BATTERY_S3C &sec_device_battery, #endif -#if defined(CONFIG_HAVE_PWM) + +#if defined(CONFIG_BACKLIGHT_PWM) smdk_backlight_register(); #endif jupiter_switch_init(); |