Commit 7ee302f6 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 81f70ba2 1a1503c5
...@@ -1271,6 +1271,8 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) ...@@ -1271,6 +1271,8 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
switch (dev->device) { switch (dev->device) {
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_SMBUS: case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_SMBUS:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_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: case PCI_DEVICE_ID_INTEL_DNV_SMBUS:
priv->features |= FEATURE_I2C_BLOCK_READ; priv->features |= FEATURE_I2C_BLOCK_READ;
priv->features |= FEATURE_IRQ; priv->features |= FEATURE_IRQ;
......
...@@ -1450,7 +1450,8 @@ omap_i2c_probe(struct platform_device *pdev) ...@@ -1450,7 +1450,8 @@ omap_i2c_probe(struct platform_device *pdev)
err_unuse_clocks: err_unuse_clocks:
omap_i2c_write_reg(omap, OMAP_I2C_CON_REG, 0); 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); pm_runtime_disable(&pdev->dev);
err_free_mem: err_free_mem:
...@@ -1468,6 +1469,7 @@ static int omap_i2c_remove(struct platform_device *pdev) ...@@ -1468,6 +1469,7 @@ static int omap_i2c_remove(struct platform_device *pdev)
return ret; return ret;
omap_i2c_write_reg(omap, OMAP_I2C_CON_REG, 0); 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_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
return 0; return 0;
......
...@@ -467,7 +467,7 @@ static int uniphier_fi2c_clk_init(struct device *dev, ...@@ -467,7 +467,7 @@ static int uniphier_fi2c_clk_init(struct device *dev,
bus_speed = UNIPHIER_FI2C_DEFAULT_SPEED; bus_speed = UNIPHIER_FI2C_DEFAULT_SPEED;
if (!bus_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; return -EINVAL;
} }
......
...@@ -328,7 +328,7 @@ static int uniphier_i2c_clk_init(struct device *dev, ...@@ -328,7 +328,7 @@ static int uniphier_i2c_clk_init(struct device *dev,
bus_speed = UNIPHIER_I2C_DEFAULT_SPEED; bus_speed = UNIPHIER_I2C_DEFAULT_SPEED;
if (!bus_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; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment