Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "Some bugfixes from I2C for you:

  A fix for a RuntimePM regression with OMAP, a fix to enable TCO for
  Lewisburg platforms, and a typo fix while we are here"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: i801: Adding Intel Lewisburg support for iTCO
  i2c: uniphier: fix typos in error messages
  i2c: omap: Fix PM regression with deferred probe for pm_runtime_reinit

4 files changed, 7 insertions, 3 deletions

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index f62d69799a9c..27fa0cb09538 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -1271,6 +1271,8 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
         switch (dev->device) {
         case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_SMBUS:
         case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_SMBUS:
+        case PCI_DEVICE_ID_INTEL_LEWISBURG_SMBUS:
+        case PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS:
         case PCI_DEVICE_ID_INTEL_DNV_SMBUS:
                 priv->features |= FEATURE_I2C_BLOCK_READ;
                 priv->features |= FEATURE_IRQ;
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 08d26ba61ed3..13c45296ce5b 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1450,7 +1450,8 @@ omap_i2c_probe(struct platform_device *pdev)
 
 err_unuse_clocks:
         omap_i2c_write_reg(omap, OMAP_I2C_CON_REG, 0);
-        pm_runtime_put(omap->dev);
+        pm_runtime_dont_use_autosuspend(omap->dev);
+        pm_runtime_put_sync(omap->dev);
         pm_runtime_disable(&pdev->dev);
 err_free_mem:
 
@@ -1468,6 +1469,7 @@ static int omap_i2c_remove(struct platform_device *pdev)
                 return ret;
 
         omap_i2c_write_reg(omap, OMAP_I2C_CON_REG, 0);
+        pm_runtime_dont_use_autosuspend(&pdev->dev);
         pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
         return 0;
diff --git a/drivers/i2c/busses/i2c-uniphier-f.c b/drivers/i2c/busses/i2c-uniphier-f.c
index f3e5ff8522f0..213ba55e17c3 100644
--- a/drivers/i2c/busses/i2c-uniphier-f.c
+++ b/drivers/i2c/busses/i2c-uniphier-f.c
@@ -467,7 +467,7 @@ static int uniphier_fi2c_clk_init(struct device *dev,
                 bus_speed = UNIPHIER_FI2C_DEFAULT_SPEED;
 
         if (!bus_speed) {
-                dev_err(dev, "clock-freqyency should not be zero\n");
+                dev_err(dev, "clock-frequency should not be zero\n");
                 return -EINVAL;
         }
 
diff --git a/drivers/i2c/busses/i2c-uniphier.c b/drivers/i2c/busses/i2c-uniphier.c
index 1f4f3f53819c..89eaa8a7e1e0 100644
--- a/drivers/i2c/busses/i2c-uniphier.c
+++ b/drivers/i2c/busses/i2c-uniphier.c
@@ -328,7 +328,7 @@ static int uniphier_i2c_clk_init(struct device *dev,
                 bus_speed = UNIPHIER_I2C_DEFAULT_SPEED;
 
         if (!bus_speed) {
-                dev_err(dev, "clock-freqyency should not be zero\n");
+                dev_err(dev, "clock-frequency should not be zero\n");
                 return -EINVAL;
         }