Commit d3dca690 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:
 "I2C has quite some regression fixes this time.

  One is also related to watchdogs, we have proper acks from Guenter for
  them"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: acpi: put device when verifying client fails
  misc: eeprom: at24: fix regulator underflow
  i2c: gpio: suppress error on probe defer
  macintosh: windfarm: fix MODINFO regression
  i2c: designware-pci: Fix BUG_ON during device removal
  i2c: i801: Do not add ICH_RES_IO_SMI for the iTCO_wdt device
  watchdog: iTCO_wdt: Make ICH_RES_IO_SMI optional
  watchdog: iTCO_wdt: Export vendorsupport
parents 3086ae07 92bd1f2e

drivers/i2c/busses/i2c-designware-pcidrv.c

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ static void i2c_dw_pci_remove(struct pci_dev *pdev) 
	pm_runtime_get_noresume(&pdev->dev);



	i2c_del_adapter(&dev->adapter);

	devm_free_irq(&pdev->dev, dev->irq, dev);

	pci_free_irq_vectors(pdev);

}

drivers/i2c/busses/i2c-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static struct gpio_desc *i2c_gpio_get_desc(struct device *dev, 
	if (ret == -ENOENT)

		retdesc = ERR_PTR(-EPROBE_DEFER);



	if (ret != -EPROBE_DEFER)

	if (PTR_ERR(retdesc) != -EPROBE_DEFER)

		dev_err(dev, "error trying to get descriptor: %d\n", ret);



	return retdesc;

drivers/i2c/busses/i2c-i801.c

+12 −33
Original line number Diff line number Diff line
@@ -132,11 +132,6 @@ 
#define TCOBASE		0x050

#define TCOCTL		0x054



#define ACPIBASE		0x040

#define ACPIBASE_SMI_OFF	0x030

#define ACPICTRL		0x044

#define ACPICTRL_EN		0x080



#define SBREG_BAR		0x10

#define SBREG_SMBCTRL		0xc6000c

#define SBREG_SMBCTRL_DNV	0xcf000c
@@ -1553,7 +1548,7 @@ i801_add_tco_spt(struct i801_priv *priv, struct pci_dev *pci_dev, 
		pci_bus_write_config_byte(pci_dev->bus, devfn, 0xe1, hidden);

	spin_unlock(&p2sb_spinlock);



	res = &tco_res[ICH_RES_MEM_OFF];

	res = &tco_res[1];

	if (pci_dev->device == PCI_DEVICE_ID_INTEL_DNV_SMBUS)

		res->start = (resource_size_t)base64_addr + SBREG_SMBCTRL_DNV;

	else
@@ -1563,7 +1558,7 @@ i801_add_tco_spt(struct i801_priv *priv, struct pci_dev *pci_dev, 
	res->flags = IORESOURCE_MEM;



	return platform_device_register_resndata(&pci_dev->dev, "iTCO_wdt", -1,

					tco_res, 3, &spt_tco_platform_data,

					tco_res, 2, &spt_tco_platform_data,

					sizeof(spt_tco_platform_data));

}
@@ -1576,17 +1571,16 @@ static struct platform_device * 
i801_add_tco_cnl(struct i801_priv *priv, struct pci_dev *pci_dev,

		 struct resource *tco_res)

{

	return platform_device_register_resndata(&pci_dev->dev, "iTCO_wdt", -1,

					tco_res, 2, &cnl_tco_platform_data,

	return platform_device_register_resndata(&pci_dev->dev,

			"iTCO_wdt", -1, tco_res, 1, &cnl_tco_platform_data,

			sizeof(cnl_tco_platform_data));

}



static void i801_add_tco(struct i801_priv *priv)

{

	u32 base_addr, tco_base, tco_ctl, ctrl_val;

	struct pci_dev *pci_dev = priv->pci_dev;

	struct resource tco_res[3], *res;

	unsigned int devfn;

	struct resource tco_res[2], *res;

	u32 tco_base, tco_ctl;



	/* If we have ACPI based watchdog use that instead */

	if (acpi_has_watchdog())
@@ -1601,30 +1595,15 @@ static void i801_add_tco(struct i801_priv *priv) 
		return;



	memset(tco_res, 0, sizeof(tco_res));



	res = &tco_res[ICH_RES_IO_TCO];

	res->start = tco_base & ~1;

	res->end = res->start + 32 - 1;

	res->flags = IORESOURCE_IO;



	/*

	 * Power Management registers.

	 * Always populate the main iTCO IO resource here. The second entry

	 * for NO_REBOOT MMIO is filled by the SPT specific function.

	 */

	devfn = PCI_DEVFN(PCI_SLOT(pci_dev->devfn), 2);

	pci_bus_read_config_dword(pci_dev->bus, devfn, ACPIBASE, &base_addr);



	res = &tco_res[ICH_RES_IO_SMI];

	res->start = (base_addr & ~1) + ACPIBASE_SMI_OFF;

	res->end = res->start + 3;

	res = &tco_res[0];

	res->start = tco_base & ~1;

	res->end = res->start + 32 - 1;

	res->flags = IORESOURCE_IO;



	/*

	 * Enable the ACPI I/O space.

	 */

	pci_bus_read_config_dword(pci_dev->bus, devfn, ACPICTRL, &ctrl_val);

	ctrl_val |= ACPICTRL_EN;

	pci_bus_write_config_dword(pci_dev->bus, devfn, ACPICTRL, ctrl_val);



	if (priv->features & FEATURE_TCO_CNL)

		priv->tco_pdev = i801_add_tco_cnl(priv, pci_dev, tco_res);

	else

drivers/i2c/i2c-core-acpi.c

+9 −1
Original line number Diff line number Diff line
@@ -394,9 +394,17 @@ EXPORT_SYMBOL_GPL(i2c_acpi_find_adapter_by_handle); 
static struct i2c_client *i2c_acpi_find_client_by_adev(struct acpi_device *adev)

{

	struct device *dev;

	struct i2c_client *client;



	dev = bus_find_device_by_acpi_dev(&i2c_bus_type, adev);

	return dev ? i2c_verify_client(dev) : NULL;

	if (!dev)

		return NULL;



	client = i2c_verify_client(dev);

	if (!client)

		put_device(dev);



	return client;

}



static int i2c_acpi_notify(struct notifier_block *nb, unsigned long value,

drivers/macintosh/windfarm_ad7417_sensor.c

+7 −0
Original line number Diff line number Diff line
@@ -312,9 +312,16 @@ static const struct i2c_device_id wf_ad7417_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, wf_ad7417_id);



static const struct of_device_id wf_ad7417_of_id[] = {

	{ .compatible = "ad7417", },

	{ }

};

MODULE_DEVICE_TABLE(of, wf_ad7417_of_id);



static struct i2c_driver wf_ad7417_driver = {

	.driver = {

		.name	= "wf_ad7417",

		.of_match_table = wf_ad7417_of_id,

	},

	.probe		= wf_ad7417_probe,

	.remove		= wf_ad7417_remove,

CRA Git | Maintained and supported by SUSTech CRA and CCSE