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>

diff --git a/arch/arm/mach-s3c2443/s3c2443.c b/arch/arm/mach-s3c2443/s3c2443.c
index 5df6458ddd42160e7bed0115d73f5e45a973ea74..a22b771b0f36c4c05ab9429fab4aea4ad14f4729 100644 (file)
--- a/arch/arm/mach-s3c2443/s3c2443.c
+++ b/arch/arm/mach-s3c2443/s3c2443.c
@@ -41,6 +41,7 @@
 #include <plat/cpu.h>
 #include <plat/fb-core.h>
 #include <plat/nand-core.h>
+#include <plat/adc-core.h>
 
 static struct map_desc s3c2443_iodesc[] __initdata = {
        IODESC_ENT(WATCHDOG),
@@ -70,6 +71,8 @@ int __init s3c2443_init(void)
        s3c_nand_setname("s3c2412-nand");
        s3c_fb_setname("s3c2443-fb");
 
+       s3c_adc_setname("s3c2443-adc");
+
        /* change WDT IRQ number */
        s3c_device_wdt.resource[1].start = IRQ_S3C2443_WDT;
        s3c_device_wdt.resource[1].end   = IRQ_S3C2443_WDT;

diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c
index 7821055a5046ccc84670865e0bb53f6354d7069f..8d8c4cc023dbb990989ee298b3e4e8434503ff9d 100644 (file)
--- a/arch/arm/plat-samsung/adc.c
+++ b/arch/arm/plat-samsung/adc.c
@@ -41,6 +41,7 @@
 
 enum s3c_cpu_type {
        TYPE_ADCV1, /* S3C24XX */
+       TYPE_ADCV11, /* S3C2443 */
        TYPE_ADCV2, /* S3C64XX, S5P64X0, S5PC100 */
        TYPE_ADCV3, /* S5PV210, S5PC110, EXYNOS4210 */
 };
@@ -106,6 +107,9 @@ static inline void s3c_adc_select(struct adc_device *adc,
        if (!client->is_ts) {
                if (cpu == TYPE_ADCV3)
                        writel(client->channel & 0xf, adc->regs + S5P_ADCMUX);
+               else if (cpu == TYPE_ADCV11)
+                       writel(client->channel & 0xf,
+                                               adc->regs + S3C2443_ADCMUX);
                else
                        con |= S3C2410_ADCCON_SELMUX(client->channel);
        }
@@ -294,13 +298,13 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw)
 
        client->nr_samples--;
 
-       if (cpu != TYPE_ADCV1) {
+       if (cpu == TYPE_ADCV1 || cpu == TYPE_ADCV11) {
+               data0 &= 0x3ff;
+               data1 &= 0x3ff;
+       } else {
                /* S3C64XX/S5P ADC resolution is 12-bit */
                data0 &= 0xfff;
                data1 &= 0xfff;
-       } else {
-               data0 &= 0x3ff;
-               data1 &= 0x3ff;
        }
 
        if (client->convert_cb)
@@ -321,7 +325,7 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw)
        }
 
 exit:
-       if (cpu != TYPE_ADCV1) {
+       if (cpu == TYPE_ADCV2 || cpu == TYPE_ADCV3) {
                /* Clear ADC interrupt */
                writel(0, adc->regs + S3C64XX_ADCCLRINT);
        }
@@ -492,6 +496,9 @@ static struct platform_device_id s3c_adc_driver_ids[] = {
        {
                .name           = "s3c24xx-adc",
                .driver_data    = TYPE_ADCV1,
+       }, {
+               .name           = "s3c2443-adc",
+               .driver_data    = TYPE_ADCV11,
        }, {
                .name           = "s3c64xx-adc",
                .driver_data    = TYPE_ADCV2,