Merge branch 'i2c-next' of git://aeryn.fluff.org.uk/bjdooks/linux

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / i2c-s3c2410.c

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index d6343e2c5889fec1945a61d7290d96ed9b3e25c1..f69f91ffb469a6f110227a8f4eee410c6e85501f 100644 (file)
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -38,8 +38,8 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#include <asm/plat-s3c/regs-iic.h>
-#include <asm/plat-s3c/iic.h>
+#include <plat/regs-iic.h>
+#include <plat/iic.h>
 
 /* i2c controller state */
 
@@ -54,6 +54,7 @@ enum s3c24xx_i2c_state {
 struct s3c24xx_i2c {
        spinlock_t              lock;
        wait_queue_head_t       wait;
+       unsigned int            suspended:1;
 
        struct i2c_msg          *msg;
        unsigned int            msg_num;
@@ -61,6 +62,7 @@ struct s3c24xx_i2c {
        unsigned int            msg_ptr;
 
        unsigned int            tx_setup;
+       unsigned int            irq;
 
        enum s3c24xx_i2c_state  state;
        unsigned long           clkrate;
@@ -68,7 +70,6 @@ struct s3c24xx_i2c {
        void __iomem            *regs;
        struct clk              *clk;
        struct device           *dev;
-       struct resource         *irq;
        struct resource         *ioarea;
        struct i2c_adapter      adap;
 
@@ -476,7 +477,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c,
        unsigned long timeout;
        int ret;
 
-       if (!(readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN))
+       if (i2c->suspended)
                return -EIO;
 
        ret = s3c24xx_i2c_set_master(i2c);
@@ -559,19 +560,6 @@ static const struct i2c_algorithm s3c24xx_i2c_algorithm = {
        .functionality          = s3c24xx_i2c_func,
 };
 
-static struct s3c24xx_i2c s3c24xx_i2c = {
-       .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_i2c.lock),
-       .wait           = __WAIT_QUEUE_HEAD_INITIALIZER(s3c24xx_i2c.wait),
-       .tx_setup       = 50,
-       .adap           = {
-               .name                   = "s3c2410-i2c",
-               .owner                  = THIS_MODULE,
-               .algo                   = &s3c24xx_i2c_algorithm,
-               .retries                = 2,
-               .class                  = I2C_CLASS_HWMON | I2C_CLASS_SPD,
-       },
-};
-
 /* s3c24xx_i2c_calcdivisor
  *
  * return the divisor settings for a given frequency
@@ -797,7 +785,7 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 
 static int s3c24xx_i2c_probe(struct platform_device *pdev)
 {
-       struct s3c24xx_i2c *i2c = &s3c24xx_i2c;
+       struct s3c24xx_i2c *i2c;
        struct s3c2410_platform_i2c *pdata;
        struct resource *res;
        int ret;
@@ -808,6 +796,22 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
+       i2c = kzalloc(sizeof(struct s3c24xx_i2c), GFP_KERNEL);
+       if (!i2c) {
+               dev_err(&pdev->dev, "no memory for state\n");
+               return -ENOMEM;
+       }
+
+       strlcpy(i2c->adap.name, "s3c2410-i2c", sizeof(i2c->adap.name));
+       i2c->adap.owner   = THIS_MODULE;
+       i2c->adap.algo    = &s3c24xx_i2c_algorithm;
+       i2c->adap.retries = 2;
+       i2c->adap.class   = I2C_CLASS_HWMON | I2C_CLASS_SPD;
+       i2c->tx_setup     = 50;
+
+       spin_lock_init(&i2c->lock);
+       init_waitqueue_head(&i2c->wait);
+
        /* find the clock and enable it */
 
        i2c->dev = &pdev->dev;
@@ -866,26 +870,20 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
         * ensure no current IRQs pending
         */
 
-       res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (res == NULL) {
+       i2c->irq = ret = platform_get_irq(pdev, 0);
+       if (ret <= 0) {
                dev_err(&pdev->dev, "cannot find IRQ\n");
-               ret = -ENOENT;
                goto err_iomap;
        }
 
-       ret = request_irq(res->start, s3c24xx_i2c_irq, IRQF_DISABLED,
-                         pdev->name, i2c);
+       ret = request_irq(i2c->irq, s3c24xx_i2c_irq, IRQF_DISABLED,
+                         dev_name(&pdev->dev), i2c);
 
        if (ret != 0) {
-               dev_err(&pdev->dev, "cannot claim IRQ\n");
+               dev_err(&pdev->dev, "cannot claim IRQ %d\n", i2c->irq);
                goto err_iomap;
        }
 
-       i2c->irq = res;
-
-       dev_dbg(&pdev->dev, "irq resource %p (%lu)\n", res,
-               (unsigned long)res->start);
-
        ret = s3c24xx_i2c_register_cpufreq(i2c);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to register cpufreq notifier\n");
@@ -915,7 +913,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
        s3c24xx_i2c_deregister_cpufreq(i2c);
 
  err_irq:
-       free_irq(i2c->irq->start, i2c);
+       free_irq(i2c->irq, i2c);
 
  err_iomap:
        iounmap(i2c->regs);
@@ -929,6 +927,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
        clk_put(i2c->clk);
 
  err_noclk:
+       kfree(i2c);
        return ret;
 }
 
@@ -944,7 +943,7 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)
        s3c24xx_i2c_deregister_cpufreq(i2c);
 
        i2c_del_adapter(&i2c->adap);
-       free_irq(i2c->irq->start, i2c);
+       free_irq(i2c->irq, i2c);
 
        clk_disable(i2c->clk);
        clk_put(i2c->clk);
@@ -953,22 +952,32 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)
 
        release_resource(i2c->ioarea);
        kfree(i2c->ioarea);
+       kfree(i2c);
 
        return 0;
 }
 
 #ifdef CONFIG_PM
+static int s3c24xx_i2c_suspend_late(struct platform_device *dev,
+                                   pm_message_t msg)
+{
+       struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
+       i2c->suspended = 1;
+       return 0;
+}
+
 static int s3c24xx_i2c_resume(struct platform_device *dev)
 {
        struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
 
-       if (i2c != NULL)
-               s3c24xx_i2c_init(i2c);
+       i2c->suspended = 0;
+       s3c24xx_i2c_init(i2c);
 
        return 0;
 }
 
 #else
+#define s3c24xx_i2c_suspend_late NULL
 #define s3c24xx_i2c_resume NULL
 #endif
 
@@ -977,6 +986,7 @@ static int s3c24xx_i2c_resume(struct platform_device *dev)
 static struct platform_driver s3c2410_i2c_driver = {
        .probe          = s3c24xx_i2c_probe,
        .remove         = s3c24xx_i2c_remove,
+       .suspend_late   = s3c24xx_i2c_suspend_late,
        .resume         = s3c24xx_i2c_resume,
        .driver         = {
                .owner  = THIS_MODULE,
@@ -987,6 +997,7 @@ static struct platform_driver s3c2410_i2c_driver = {
 static struct platform_driver s3c2440_i2c_driver = {
        .probe          = s3c24xx_i2c_probe,
        .remove         = s3c24xx_i2c_remove,
+       .suspend_late   = s3c24xx_i2c_suspend_late,
        .resume         = s3c24xx_i2c_resume,
        .driver         = {
                .owner  = THIS_MODULE,