1 files changed, 64 insertions, 20 deletions

diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c
index e8f2be2d67f..ee8deef1948 100644
--- a/arch/arm/plat-samsung/adc.c
+++ b/arch/arm/plat-samsung/adc.c
@@ -21,6 +21,7 @@
 #include <linux/clk.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/regulator/consumer.h>
 
 #include <plat/regs-adc.h>
 #include <plat/adc.h>
@@ -39,8 +40,9 @@
  */
 
 enum s3c_cpu_type {
-        TYPE_S3C24XX,
-        TYPE_S3C64XX
+        TYPE_ADCV1, /* S3C24XX */
+        TYPE_ADCV2, /* S3C64XX, S5P64X0, S5PC100 */
+        TYPE_ADCV3, /* S5PV210, S5PC110, EXYNOS4210 */
 };
 
 struct s3c_adc_client {
@@ -71,6 +73,7 @@ struct adc_device {
         unsigned int             prescale;
 
         int                      irq;
+        struct regulator        *vdd;
 };
 
 static struct adc_device *adc_dev;
@@ -91,6 +94,7 @@ static inline void s3c_adc_select(struct adc_device *adc,
                                   struct s3c_adc_client *client)
 {
         unsigned con = readl(adc->regs + S3C2410_ADCCON);
+        enum s3c_cpu_type cpu = platform_get_device_id(adc->pdev)->driver_data;
 
         client->select_cb(client, 1);
 
@@ -98,8 +102,12 @@ static inline void s3c_adc_select(struct adc_device *adc,
         con &= ~S3C2410_ADCCON_STDBM;
         con &= ~S3C2410_ADCCON_STARTMASK;
 
-        if (!client->is_ts)
-                con |= S3C2410_ADCCON_SELMUX(client->channel);
+        if (!client->is_ts) {
+                if (cpu == TYPE_ADCV3)
+                        writel(client->channel & 0xf, adc->regs + S5P_ADCMUX);
+                else
+                        con |= S3C2410_ADCCON_SELMUX(client->channel);
+        }
 
         writel(con, adc->regs + S3C2410_ADCCON);
 }
@@ -285,8 +293,8 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw)
 
         client->nr_samples--;
 
-        if (cpu == TYPE_S3C64XX) {
-                /* S3C64XX ADC resolution is 12-bit */
+        if (cpu != TYPE_ADCV1) {
+                /* S3C64XX/S5P ADC resolution is 12-bit */
                 data0 &= 0xfff;
                 data1 &= 0xfff;
         } else {
@@ -312,7 +320,7 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw)
         }
 
 exit:
-        if (cpu == TYPE_S3C64XX) {
+        if (cpu != TYPE_ADCV1) {
                 /* Clear ADC interrupt */
                 writel(0, adc->regs + S3C64XX_ADCCLRINT);
         }
@@ -338,17 +346,24 @@ static int s3c_adc_probe(struct platform_device *pdev)
         adc->pdev = pdev;
         adc->prescale = S3C2410_ADCCON_PRSCVL(49);
 
+        adc->vdd = regulator_get(dev, "vdd");
+        if (IS_ERR(adc->vdd)) {
+                dev_err(dev, "operating without regulator \"vdd\" .\n");
+                ret = PTR_ERR(adc->vdd);
+                goto err_alloc;
+        }
+
         adc->irq = platform_get_irq(pdev, 1);
         if (adc->irq <= 0) {
                 dev_err(dev, "failed to get adc irq\n");
                 ret = -ENOENT;
-                goto err_alloc;
+                goto err_reg;
         }
 
         ret = request_irq(adc->irq, s3c_adc_irq, 0, dev_name(dev), adc);
         if (ret < 0) {
                 dev_err(dev, "failed to attach adc irq\n");
-                goto err_alloc;
+                goto err_reg;
         }
 
         adc->clk = clk_get(dev, "adc");
@@ -372,10 +387,14 @@ static int s3c_adc_probe(struct platform_device *pdev)
                 goto err_clk;
         }
 
+        ret = regulator_enable(adc->vdd);
+        if (ret)
+                goto err_ioremap;
+
         clk_enable(adc->clk);
 
         tmp = adc->prescale | S3C2410_ADCCON_PRSCEN;
-        if (platform_get_device_id(pdev)->driver_data == TYPE_S3C64XX) {
+        if (platform_get_device_id(pdev)->driver_data != TYPE_ADCV1) {
                 /* Enable 12-bit ADC resolution */
                 tmp |= S3C64XX_ADCCON_RESSEL;
         }
@@ -388,12 +407,15 @@ static int s3c_adc_probe(struct platform_device *pdev)
 
         return 0;
 
+ err_ioremap:
+        iounmap(adc->regs);
  err_clk:
         clk_put(adc->clk);
 
  err_irq:
         free_irq(adc->irq, adc);
-
+ err_reg:
+        regulator_put(adc->vdd);
  err_alloc:
         kfree(adc);
         return ret;
@@ -406,6 +428,8 @@ static int __devexit s3c_adc_remove(struct platform_device *pdev)
         iounmap(adc->regs);
         free_irq(adc->irq, adc);
         clk_disable(adc->clk);
+        regulator_disable(adc->vdd);
+        regulator_put(adc->vdd);
         clk_put(adc->clk);
         kfree(adc);
 
@@ -413,8 +437,10 @@ static int __devexit s3c_adc_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static int s3c_adc_suspend(struct platform_device *pdev, pm_message_t state)
+static int s3c_adc_suspend(struct device *dev)
 {
+        struct platform_device *pdev = container_of(dev,
+                        struct platform_device, dev);
         struct adc_device *adc = platform_get_drvdata(pdev);
         unsigned long flags;
         u32 con;
@@ -428,19 +454,30 @@ static int s3c_adc_suspend(struct platform_device *pdev, pm_message_t state)
         disable_irq(adc->irq);
         spin_unlock_irqrestore(&adc->lock, flags);
         clk_disable(adc->clk);
+        regulator_disable(adc->vdd);
 
         return 0;
 }
 
-static int s3c_adc_resume(struct platform_device *pdev)
+static int s3c_adc_resume(struct device *dev)
 {
+        struct platform_device *pdev = container_of(dev,
+                        struct platform_device, dev);
         struct adc_device *adc = platform_get_drvdata(pdev);
+        int ret;
+        unsigned long tmp;
 
+        ret = regulator_enable(adc->vdd);
+        if (ret)
+                return ret;
         clk_enable(adc->clk);
         enable_irq(adc->irq);
 
-        writel(adc->prescale | S3C2410_ADCCON_PRSCEN,
-               adc->regs + S3C2410_ADCCON);
+        tmp = adc->prescale | S3C2410_ADCCON_PRSCEN;
+        /* Enable 12-bit ADC resolution */
+        if (platform_get_device_id(pdev)->driver_data != TYPE_ADCV1)
+                tmp |= S3C64XX_ADCCON_RESSEL;
+        writel(tmp, adc->regs + S3C2410_ADCCON);
 
         return 0;
 }
@@ -453,25 +490,32 @@ static int s3c_adc_resume(struct platform_device *pdev)
 static struct platform_device_id s3c_adc_driver_ids[] = {
         {
                 .name           = "s3c24xx-adc",
-                .driver_data    = TYPE_S3C24XX,
+                .driver_data    = TYPE_ADCV1,
         }, {
                 .name           = "s3c64xx-adc",
-                .driver_data    = TYPE_S3C64XX,
+                .driver_data    = TYPE_ADCV2,
+        }, {
+                .name           = "samsung-adc-v3",
+                .driver_data    = TYPE_ADCV3,
         },
         { }
 };
 MODULE_DEVICE_TABLE(platform, s3c_adc_driver_ids);
 
+static const struct dev_pm_ops adc_pm_ops = {
+        .suspend        = s3c_adc_suspend,
+        .resume         = s3c_adc_resume,
+};
+
 static struct platform_driver s3c_adc_driver = {
         .id_table       = s3c_adc_driver_ids,
         .driver         = {
                 .name   = "s3c-adc",
                 .owner  = THIS_MODULE,
+                .pm     = &adc_pm_ops,
         },
         .probe          = s3c_adc_probe,
         .remove         = __devexit_p(s3c_adc_remove),
-        .suspend        = s3c_adc_suspend,
-        .resume         = s3c_adc_resume,
 };
 
 static int __init adc_init(void)
@@ -485,4 +529,4 @@ static int __init adc_init(void)
         return ret;
 }
 
-arch_initcall(adc_init);
+module_init(adc_init);