From 7ddf2bb46771e10d4cc7da94b3c1210426806def Mon Sep 17 00:00:00 2001 From: Nelson Castillo Date: Fri, 18 Sep 2009 01:45:39 -0500 Subject: Make s3c TS driver use s3c-adc API I had a patch by Vasily Khoruzhick in the linux-arm-kernel as a guide for some of the changes. Signed-off-by: Nelson Castillo --- arch/arm/mach-s3c2442/mach-gta02.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm/mach-s3c2442') diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index e4f052595bd..346c2298b08 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -1717,6 +1717,9 @@ static void __init gta02_machine_init(void) gta02_vibrator_dev.dev.parent = &s3c24xx_pwm_device.dev; platform_device_register(>a02_vibrator_dev); #endif +#ifdef CONFIG_S3C24XX_ADC + platform_device_register(&s3c_device_adc); +#endif } void DEBUG_LED(int n) -- cgit v1.2.3 From f7c1655ba09cdf316156883ab088f2030a651678 Mon Sep 17 00:00:00 2001 From: Nelson Castillo Date: Wed, 23 Sep 2009 02:01:37 -0500 Subject: Require CONFIG_S3C24XX_ADC for GTA01/GTA02 Select CONFIG_S3C24XX_ADC by defult for GTA01/GTA02. Somebody will hate me if I don't send this patch soon. Signed-off-by: Nelson Castillo --- arch/arm/mach-s3c2442/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-s3c2442') diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig index aa184ba7586..13fb5e190b4 100644 --- a/arch/arm/mach-s3c2442/Kconfig +++ b/arch/arm/mach-s3c2442/Kconfig @@ -36,6 +36,7 @@ config MACH_NEO1973_GTA02 select S3C_PWM select FIQ select S3C_DEV_USB_HOST + select S3C24XX_ADC help Say Y here if you are using the FIC Neo1973 GSM Phone -- cgit v1.2.3 From 9c3fe7498950875215cdd2c3bb6b0bef70570be0 Mon Sep 17 00:00:00 2001 From: Nelson Castillo Date: Wed, 23 Sep 2009 02:44:08 -0500 Subject: Fix wrong commit I'm quite sorry I sent the commit that crashes GTA01. The fix is quite short. Fixing is easier than reverting and fixing conflicts. Signed-off-by: Nelson Castillo --- arch/arm/mach-s3c2442/mach-gta02.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/arm/mach-s3c2442') diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index 346c2298b08..380effad4d4 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -1561,6 +1561,7 @@ static struct platform_device *gta02_devices[] __initdata = { &s3c_device_usbgadget, &s3c_device_nand, >a02_nor_flash, + &s3c_device_adc, &s3c24xx_pwm_device, >a02_led_dev, @@ -1717,9 +1718,6 @@ static void __init gta02_machine_init(void) gta02_vibrator_dev.dev.parent = &s3c24xx_pwm_device.dev; platform_device_register(>a02_vibrator_dev); #endif -#ifdef CONFIG_S3C24XX_ADC - platform_device_register(&s3c_device_adc); -#endif } void DEBUG_LED(int n) -- cgit v1.2.3