4 files changed, 28 insertions, 64 deletions

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index b923074b2cbe..30f06e956bfb 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -75,8 +75,7 @@ config I2C_HELPER_AUTO
           In doubt, say Y.
 
 config I2C_SMBUS
-        tristate
-        prompt "SMBus-specific protocols" if !I2C_HELPER_AUTO
+        tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO
         help
           Say Y here if you want support for SMBus extensions to the I2C
           specification. At the moment, the only supported extension is
diff --git a/drivers/i2c/algos/Kconfig b/drivers/i2c/algos/Kconfig
index 3998dd620a03..f1cfe7e5508b 100644
--- a/drivers/i2c/algos/Kconfig
+++ b/drivers/i2c/algos/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menu "I2C Algorithms"
-        depends on !I2C_HELPER_AUTO
+        visible if !I2C_HELPER_AUTO
 
 config I2C_ALGOBIT
         tristate "I2C bit-banging interfaces"
@@ -15,15 +15,3 @@ config I2C_ALGOPCA
         tristate "I2C PCA 9564 interfaces"
 
 endmenu
-
-# In automatic configuration mode, we still have to define the
-# symbols to avoid unmet dependencies.
-
-if I2C_HELPER_AUTO
-config I2C_ALGOBIT
-        tristate
-config I2C_ALGOPCF
-        tristate
-config I2C_ALGOPCA
-        tristate
-endif
diff --git a/drivers/i2c/busses/i2c-intel-mid.c b/drivers/i2c/busses/i2c-intel-mid.c
index 80f70d3a744d..c71492782bbd 100644
--- a/drivers/i2c/busses/i2c-intel-mid.c
+++ b/drivers/i2c/busses/i2c-intel-mid.c
@@ -999,7 +999,7 @@ static int __devinit intel_mid_i2c_probe(struct pci_dev *dev,
 
         /* Initialize struct members */
         snprintf(mrst->adap.name, sizeof(mrst->adap.name),
-                "MRST/Medfield I2C at %lx", start);
+                "Intel MID I2C at %lx", start);
         mrst->adap.owner = THIS_MODULE;
         mrst->adap.algo = &intel_mid_i2c_algorithm;
         mrst->adap.dev.parent = &dev->dev;
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index b33c78586bfc..9d090833e245 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -39,6 +39,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/i2c-omap.h>
+#include <linux/pm_runtime.h>
 
 /* I2C controller revisions */
 #define OMAP_I2C_REV_2                  0x20
@@ -175,8 +176,6 @@ struct omap_i2c_dev {
         void __iomem            *base;          /* virtual */
         int                     irq;
         int                     reg_shift;      /* bit shift for I2C register addresses */
-        struct clk              *iclk;          /* Interface clock */
-        struct clk              *fclk;          /* Functional clock */
         struct completion       cmd_complete;
         struct resource         *ioarea;
         u32                     latency;        /* maximum mpu wkup latency */
@@ -265,45 +264,18 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg)
                                 (i2c_dev->regs[reg] << i2c_dev->reg_shift));
 }
 
-static int __init omap_i2c_get_clocks(struct omap_i2c_dev *dev)
+static void omap_i2c_unidle(struct omap_i2c_dev *dev)
 {
-        int ret;
+        struct platform_device *pdev;
+        struct omap_i2c_bus_platform_data *pdata;
 
-        dev->iclk = clk_get(dev->dev, "ick");
-        if (IS_ERR(dev->iclk)) {
-                ret = PTR_ERR(dev->iclk);
-                dev->iclk = NULL;
-                return ret;
-        }
+        WARN_ON(!dev->idle);
 
-        dev->fclk = clk_get(dev->dev, "fck");
-        if (IS_ERR(dev->fclk)) {
-                ret = PTR_ERR(dev->fclk);
-                if (dev->iclk != NULL) {
-                        clk_put(dev->iclk);
-                        dev->iclk = NULL;
-                }
-                dev->fclk = NULL;
-                return ret;
-        }
+        pdev = to_platform_device(dev->dev);
+        pdata = pdev->dev.platform_data;
 
-        return 0;
-}
+        pm_runtime_get_sync(&pdev->dev);
 
-static void omap_i2c_put_clocks(struct omap_i2c_dev *dev)
-{
-        clk_put(dev->fclk);
-        dev->fclk = NULL;
-        clk_put(dev->iclk);
-        dev->iclk = NULL;
-}
-
-static void omap_i2c_unidle(struct omap_i2c_dev *dev)
-{
-        WARN_ON(!dev->idle);
-
-        clk_enable(dev->iclk);
-        clk_enable(dev->fclk);
         if (cpu_is_omap34xx()) {
                 omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
                 omap_i2c_write_reg(dev, OMAP_I2C_PSC_REG, dev->pscstate);
@@ -326,10 +298,15 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev)
 
 static void omap_i2c_idle(struct omap_i2c_dev *dev)
 {
+        struct platform_device *pdev;
+        struct omap_i2c_bus_platform_data *pdata;
         u16 iv;
 
         WARN_ON(dev->idle);
 
+        pdev = to_platform_device(dev->dev);
+        pdata = pdev->dev.platform_data;
+
         dev->iestate = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG);
         if (dev->rev >= OMAP_I2C_REV_ON_4430)
                 omap_i2c_write_reg(dev, OMAP_I2C_IRQENABLE_CLR, 1);
@@ -345,8 +322,8 @@ static void omap_i2c_idle(struct omap_i2c_dev *dev)
                 omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG);
         }
         dev->idle = 1;
-        clk_disable(dev->fclk);
-        clk_disable(dev->iclk);
+
+        pm_runtime_put_sync(&pdev->dev);
 }
 
 static int omap_i2c_init(struct omap_i2c_dev *dev)
@@ -356,6 +333,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
         unsigned long fclk_rate = 12000000;
         unsigned long timeout;
         unsigned long internal_clk = 0;
+        struct clk *fclk;
 
         if (dev->rev >= OMAP_I2C_REV_2) {
                 /* Disable I2C controller before soft reset */
@@ -414,7 +392,9 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
                  * always returns 12MHz for the functional clock, we can
                  * do this bit unconditionally.
                  */
-                fclk_rate = clk_get_rate(dev->fclk);
+                fclk = clk_get(dev->dev, "fck");
+                fclk_rate = clk_get_rate(fclk);
+                clk_put(fclk);
 
                 /* TRM for 5912 says the I2C clock must be prescaled to be
                  * between 7 - 12 MHz. The XOR input clock is typically
@@ -443,7 +423,9 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
                         internal_clk = 9600;
                 else
                         internal_clk = 4000;
-                fclk_rate = clk_get_rate(dev->fclk) / 1000;
+                fclk = clk_get(dev->dev, "fck");
+                fclk_rate = clk_get_rate(fclk) / 1000;
+                clk_put(fclk);
 
                 /* Compute prescaler divisor */
                 psc = fclk_rate / internal_clk;
@@ -1048,14 +1030,12 @@ omap_i2c_probe(struct platform_device *pdev)
         else
                 dev->reg_shift = 2;
 
-        if ((r = omap_i2c_get_clocks(dev)) != 0)
-                goto err_iounmap;
-
         if (cpu_is_omap44xx())
                 dev->regs = (u8 *) omap4_reg_map;
         else
                 dev->regs = (u8 *) reg_map;
 
+        pm_runtime_enable(&pdev->dev);
         omap_i2c_unidle(dev);
 
         dev->rev = omap_i2c_read_reg(dev, OMAP_I2C_REV_REG) & 0xff;
@@ -1127,8 +1107,6 @@ err_free_irq:
 err_unuse_clocks:
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
         omap_i2c_idle(dev);
-        omap_i2c_put_clocks(dev);
-err_iounmap:
         iounmap(dev->base);
 err_free_mem:
         platform_set_drvdata(pdev, NULL);
@@ -1150,7 +1128,6 @@ omap_i2c_remove(struct platform_device *pdev)
         free_irq(dev->irq, dev);
         i2c_del_adapter(&dev->adapter);
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
-        omap_i2c_put_clocks(dev);
         iounmap(dev->base);
         kfree(dev);
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1162,7 +1139,7 @@ static struct platform_driver omap_i2c_driver = {
         .probe          = omap_i2c_probe,
         .remove         = omap_i2c_remove,
         .driver         = {
-                .name   = "i2c_omap",
+                .name   = "omap_i2c",
                 .owner  = THIS_MODULE,
         },
 };
@@ -1184,4 +1161,4 @@ module_exit(omap_i2c_exit_driver);
 MODULE_AUTHOR("MontaVista Software, Inc. (and others)");
 MODULE_DESCRIPTION("TI OMAP I2C bus adapter");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:i2c_omap");
+MODULE_ALIAS("platform:omap_i2c");