Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/i2c/busses/i2c-i801.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

drivers/i2c/busses/i2c-omap.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

drivers/i2c/busses/i2c-uniphier-f.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/i2c/busses/i2c-uniphier.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}