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-s3c2410/mach-gta01.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm/mach-s3c2410/mach-gta01.c') diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c index 8a13a4adcfd..339eb845744 100644 --- a/arch/arm/mach-s3c2410/mach-gta01.c +++ b/arch/arm/mach-s3c2410/mach-gta01.c @@ -993,6 +993,10 @@ static void __init gta01_machine_init(void) printk(KERN_DEBUG "Enabled GSM wakeup IRQ %d (rc=%d)\n", GTA01_IRQ_MODEM, rc); +#ifdef CONFIG_S3C24XX_ADC + platform_device_register(&s3c_device_adc); +#endif + pm_power_off = >a01_power_off; } -- 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-s3c2410/mach-gta01.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'arch/arm/mach-s3c2410/mach-gta01.c') diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c index 339eb845744..21726956ff6 100644 --- a/arch/arm/mach-s3c2410/mach-gta01.c +++ b/arch/arm/mach-s3c2410/mach-gta01.c @@ -560,6 +560,7 @@ static struct platform_device *gta01_devices[] __initdata = { &s3c_device_sdi, &s3c_device_usbgadget, &s3c_device_nand, + &s3c_device_adc, &s3c_device_ts, }; @@ -993,10 +994,6 @@ static void __init gta01_machine_init(void) printk(KERN_DEBUG "Enabled GSM wakeup IRQ %d (rc=%d)\n", GTA01_IRQ_MODEM, rc); -#ifdef CONFIG_S3C24XX_ADC - platform_device_register(&s3c_device_adc); -#endif - pm_power_off = >a01_power_off; } -- cgit v1.2.3