[PATCH 4/5] Make s3c TS driver use s3c-adc API

Nelson Castillo arhuaco at freaks-unidos.net
Tue Sep 22 11:23:19 CEST 2009


> index 8a13a4a..339eb84 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
> +

This is a mistake and GTA01 crashes.

Right one is:

--- 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,
 };


I'll resend.

>        pm_power_off = &gta01_power_off;
>  }
>
> diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
> index e4f0525..346c229 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(&gta02_vibrator_dev);
>  #endif
> +#ifdef CONFIG_S3C24XX_ADC
> +        platform_device_register(&s3c_device_adc);
> +#endif

Also....

--- 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,
        &gta02_nor_flash,
+       &s3c_device_adc,


I guess s3c_device_adc doesn't need to be children of PMU.
I haven't tested this yet. I'll test.



More information about the openmoko-kernel mailing list