1 files changed, 27 insertions, 16 deletions

diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 598c49acaeb5..f633a53b6dbe 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -32,6 +32,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/i2c/i2c-sh_mobile.h>
 
 /* Transmit operation:                                                      */
 /*                                                                          */
@@ -117,7 +118,7 @@ struct sh_mobile_i2c_data {
         struct device *dev;
         void __iomem *reg;
         struct i2c_adapter adap;
-
+        unsigned long bus_speed;
         struct clk *clk;
         u_int8_t icic;
         u_int8_t iccl;
@@ -205,7 +206,7 @@ static void activate_ch(struct sh_mobile_i2c_data *pd)
          * We also round off the result.
          */
         num = i2c_clk * 5;
-        denom = NORMAL_SPEED * 9;
+        denom = pd->bus_speed * 9;
         tmp = num * 10 / denom;
         if (tmp % 10 >= 5)
                 pd->iccl = (u_int8_t)((num/denom) + 1);
@@ -538,15 +539,17 @@ static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, int hook)
 {
         struct resource *res;
         int ret = -ENXIO;
-        int q, m;
-        int k = 0;
-        int n = 0;
+        int n, k = 0;
 
         while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) {
                 for (n = res->start; hook && n <= res->end; n++) {
                         if (request_irq(n, sh_mobile_i2c_isr, IRQF_DISABLED,
-                                        dev_name(&dev->dev), dev))
+                                        dev_name(&dev->dev), dev)) {
+                                for (n--; n >= res->start; n--)
+                                        free_irq(n, dev);
+
                                 goto rollback;
+                        }
                 }
                 k++;
         }
@@ -554,16 +557,17 @@ static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, int hook)
         if (hook)
                 return k > 0 ? 0 : -ENOENT;
 
-        k--;
         ret = 0;
 
  rollback:
-        for (q = k; k >= 0; k--) {
-                for (m = n; m >= res->start; m--)
-                        free_irq(m, dev);
+        k--;
+
+        while (k >= 0) {
+                res = platform_get_resource(dev, IORESOURCE_IRQ, k);
+                for (n = res->start; n <= res->end; n++)
+                        free_irq(n, dev);
 
-                res = platform_get_resource(dev, IORESOURCE_IRQ, k - 1);
-                m = res->end;
+                k--;
         }
 
         return ret;
@@ -571,10 +575,10 @@ static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, int hook)
 
 static int sh_mobile_i2c_probe(struct platform_device *dev)
 {
+        struct i2c_sh_mobile_platform_data *pdata = dev->dev.platform_data;
         struct sh_mobile_i2c_data *pd;
         struct i2c_adapter *adap;
         struct resource *res;
-        char clk_name[8];
         int size;
         int ret;
 
@@ -584,10 +588,9 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
                 return -ENOMEM;
         }
 
-        snprintf(clk_name, sizeof(clk_name), "i2c%d", dev->id);
-        pd->clk = clk_get(&dev->dev, clk_name);
+        pd->clk = clk_get(&dev->dev, NULL);
         if (IS_ERR(pd->clk)) {
-                dev_err(&dev->dev, "cannot get clock \"%s\"\n", clk_name);
+                dev_err(&dev->dev, "cannot get clock\n");
                 ret = PTR_ERR(pd->clk);
                 goto err;
         }
@@ -617,6 +620,11 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
                 goto err_irq;
         }
 
+        /* Use platformd data bus speed or NORMAL_SPEED */
+        pd->bus_speed = NORMAL_SPEED;
+        if (pdata && pdata->bus_speed)
+                pd->bus_speed = pdata->bus_speed;
+
         /* The IIC blocks on SH-Mobile ARM processors
          * come with two new bits in ICIC.
          */
@@ -657,6 +665,8 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
                 goto err_all;
         }
 
+        dev_info(&dev->dev, "I2C adapter %d with bus speed %lu Hz\n",
+                 adap->nr, pd->bus_speed);
         return 0;
 
  err_all:
@@ -726,3 +736,4 @@ module_exit(sh_mobile_i2c_adap_exit);
 MODULE_DESCRIPTION("SuperH Mobile I2C Bus Controller driver");
 MODULE_AUTHOR("Magnus Damm");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:i2c-sh_mobile");