diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 15:23:15 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 15:23:15 +0100 |
| commit | 63c949ea1dcf5d46789f13d8e9c21bb8aeb605cb (patch) | |
| tree | ca8e063aed16c0a5e5f51557861dbbad77da8bbb /arch/arm/plat-s3c/include/plat/adc.h | |
| parent | 9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd (diff) | |
| parent | bff78650a2b0ed42b8fb134b6a9b387e00027d67 (diff) | |
Merge branch 'next-s3c-hwmon' into next-s3c
Diffstat (limited to 'arch/arm/plat-s3c/include/plat/adc.h')
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/adc.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c/include/plat/adc.h b/arch/arm/plat-s3c/include/plat/adc.h index d847bd476b6..5f3b1cd53b9 100644 --- a/arch/arm/plat-s3c/include/plat/adc.h +++ b/arch/arm/plat-s3c/include/plat/adc.h @@ -19,10 +19,14 @@ struct s3c_adc_client; extern int s3c_adc_start(struct s3c_adc_client *client, unsigned int channel, unsigned int nr_samples); +extern int s3c_adc_read(struct s3c_adc_client *client, unsigned int ch); + extern struct s3c_adc_client * s3c_adc_register(struct platform_device *pdev, - void (*select)(unsigned selected), - void (*conv)(unsigned d0, unsigned d1, + void (*select)(struct s3c_adc_client *client, + unsigned selected), + void (*conv)(struct s3c_adc_client *client, + unsigned d0, unsigned d1, unsigned *samples_left), unsigned int is_ts); |