Commit 81051f91 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:
 "A few bugfixes and one PCI ID addition from I2C"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: i801: add Intel Lewisburg device IDs
  i2c: fix wakeup irq parsing
  i2c: xiic: Prevent concurrent running of the IRQ handler and __xiic_start_xfer()
  i2c: Revert "i2c: xiic: Do not reset controller before every transfer"
  i2c: imx: fix a compiling error
parents 116dfe5e cdc5a311

Documentation/i2c/busses/i2c-i801

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ Supported adapters: 
  * Intel Sunrise Point-LP (PCH)

  * Intel DNV (SOC)

  * Intel Broxton (SOC)

  * Intel Lewisburg (PCH)

   Datasheets: Publicly available at the Intel website



On Intel Patsburg and later chipsets, both the normal host SMBus controller

drivers/i2c/busses/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ config I2C_I801 
	    Sunrise Point-LP (PCH)

	    DNV (SOC)

	    Broxton (SOC)

	    Lewisburg (PCH)



	  This driver can also be built as a module.  If so, the module

	  will be called i2c-i801.

drivers/i2c/busses/i2c-i801.c

+6 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ 
 * Sunrise Point-LP (PCH)	0x9d23	32	hard	yes	yes	yes

 * DNV (SOC)			0x19df	32	hard	yes	yes	yes

 * Broxton (SOC)		0x5ad4	32	hard	yes	yes	yes

 * Lewisburg (PCH)		0xa1a3	32	hard	yes	yes	yes

 * Lewisburg Supersku (PCH)	0xa223	32	hard	yes	yes	yes

 *

 * Features supported by this driver:

 * Software PEC				no
@@ -206,6 +208,8 @@ 
#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_SMBUS	0x9d23

#define PCI_DEVICE_ID_INTEL_DNV_SMBUS			0x19df

#define PCI_DEVICE_ID_INTEL_BROXTON_SMBUS		0x5ad4

#define PCI_DEVICE_ID_INTEL_LEWISBURG_SMBUS		0xa1a3

#define PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS	0xa223



struct i801_mux_config {

	char *gpio_chip;
@@ -869,6 +873,8 @@ static const struct pci_device_id i801_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_DNV_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BROXTON_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LEWISBURG_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS) },

	{ 0, }

};

drivers/i2c/busses/i2c-imx.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <linux/of_device.h>

#include <linux/of_dma.h>

#include <linux/of_gpio.h>

#include <linux/pinctrl/consumer.h>

#include <linux/platform_data/i2c-imx.h>

#include <linux/platform_device.h>

#include <linux/sched.h>

drivers/i2c/busses/i2c-xiic.c

+3 −1
Original line number Diff line number Diff line
@@ -662,8 +662,10 @@ static void __xiic_start_xfer(struct xiic_i2c *i2c) 


static void xiic_start_xfer(struct xiic_i2c *i2c)

{



	spin_lock(&i2c->lock);

	xiic_reinit(i2c);

	__xiic_start_xfer(i2c);

	spin_unlock(&i2c->lock);

}



static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)

CRA Git | Maintained and supported by SUSTech CRA and CCSE