aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/adc.c
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2011-10-12 08:34:12 -0400
committerKukjin Kim <kgene.kim@samsung.com>2011-10-14 02:15:18 -0400
commit6247cea2b9c193a845a01381c36e18f11676fdfb (patch)
tree2c1a398c0971f10fbb3a76741e18b14408df128d /arch/arm/plat-samsung/adc.c
parentf8c414b516e17328bb1ab359b273c76a2e665b68 (diff)
ARM: SAMSUNG: Add support s3c2443-adc for S3C2443
The S3C2443-adc is 10 bit wide and has its mux-select in an extra register at base+0x18 Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-samsung/adc.c')
-rw-r--r--arch/arm/plat-samsung/adc.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c
index 7821055a5046..8d8c4cc023db 100644
--- a/arch/arm/plat-samsung/adc.c
+++ b/arch/arm/plat-samsung/adc.c
@@ -41,6 +41,7 @@
41 41
42enum s3c_cpu_type { 42enum s3c_cpu_type {
43 TYPE_ADCV1, /* S3C24XX */ 43 TYPE_ADCV1, /* S3C24XX */
44 TYPE_ADCV11, /* S3C2443 */
44 TYPE_ADCV2, /* S3C64XX, S5P64X0, S5PC100 */ 45 TYPE_ADCV2, /* S3C64XX, S5P64X0, S5PC100 */
45 TYPE_ADCV3, /* S5PV210, S5PC110, EXYNOS4210 */ 46 TYPE_ADCV3, /* S5PV210, S5PC110, EXYNOS4210 */
46}; 47};
@@ -106,6 +107,9 @@ static inline void s3c_adc_select(struct adc_device *adc,
106 if (!client->is_ts) { 107 if (!client->is_ts) {
107 if (cpu == TYPE_ADCV3) 108 if (cpu == TYPE_ADCV3)
108 writel(client->channel & 0xf, adc->regs + S5P_ADCMUX); 109 writel(client->channel & 0xf, adc->regs + S5P_ADCMUX);
110 else if (cpu == TYPE_ADCV11)
111 writel(client->channel & 0xf,
112 adc->regs + S3C2443_ADCMUX);
109 else 113 else
110 con |= S3C2410_ADCCON_SELMUX(client->channel); 114 con |= S3C2410_ADCCON_SELMUX(client->channel);
111 } 115 }
@@ -294,13 +298,13 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw)
294 298
295 client->nr_samples--; 299 client->nr_samples--;
296 300
297 if (cpu != TYPE_ADCV1) { 301 if (cpu == TYPE_ADCV1 || cpu == TYPE_ADCV11) {
302 data0 &= 0x3ff;
303 data1 &= 0x3ff;
304 } else {
298 /* S3C64XX/S5P ADC resolution is 12-bit */ 305 /* S3C64XX/S5P ADC resolution is 12-bit */
299 data0 &= 0xfff; 306 data0 &= 0xfff;
300 data1 &= 0xfff; 307 data1 &= 0xfff;
301 } else {
302 data0 &= 0x3ff;
303 data1 &= 0x3ff;
304 } 308 }
305 309
306 if (client->convert_cb) 310 if (client->convert_cb)
@@ -321,7 +325,7 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw)
321 } 325 }
322 326
323exit: 327exit:
324 if (cpu != TYPE_ADCV1) { 328 if (cpu == TYPE_ADCV2 || cpu == TYPE_ADCV3) {
325 /* Clear ADC interrupt */ 329 /* Clear ADC interrupt */
326 writel(0, adc->regs + S3C64XX_ADCCLRINT); 330 writel(0, adc->regs + S3C64XX_ADCCLRINT);
327 } 331 }
@@ -493,6 +497,9 @@ static struct platform_device_id s3c_adc_driver_ids[] = {
493 .name = "s3c24xx-adc", 497 .name = "s3c24xx-adc",
494 .driver_data = TYPE_ADCV1, 498 .driver_data = TYPE_ADCV1,
495 }, { 499 }, {
500 .name = "s3c2443-adc",
501 .driver_data = TYPE_ADCV11,
502 }, {
496 .name = "s3c64xx-adc", 503 .name = "s3c64xx-adc",
497 .driver_data = TYPE_ADCV2, 504 .driver_data = TYPE_ADCV2,
498 }, { 505 }, {