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

Commit 6562271a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

Pull i2c subsystem fixes from Jean Delvare.

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-core: Fix for lockdep validator
  i2c-designware: Fix build error if CONFIG_I2C_DESIGNWARE_PLATFORM=y && CONFIG_I2C_DESIGNWARE_PCI=y
  i2c-i801: Add Device IDs for Intel Lynx Point-LP PCH
parents 5d67f2e8 390946b1

Documentation/i2c/busses/i2c-i801

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Supported adapters: 
  * Intel DH89xxCC (PCH)

  * Intel Panther Point (PCH)

  * Intel Lynx Point (PCH)

  * Intel Lynx Point-LP (PCH)

   Datasheets: Publicly available at the Intel website



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

drivers/i2c/busses/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ config I2C_I801 
	    DH89xxCC (PCH)

	    Panther Point (PCH)

	    Lynx Point (PCH)

	    Lynx Point-LP (PCH)



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

	  will be called i2c-i801.
@@ -354,9 +355,13 @@ config I2C_DAVINCI 
	  devices such as DaVinci NIC.

	  For details please see http://www.ti.com/davinci



config I2C_DESIGNWARE_CORE

	tristate



config I2C_DESIGNWARE_PLATFORM

	tristate "Synopsys DesignWare Platform"

	depends on HAVE_CLK

	select I2C_DESIGNWARE_CORE

	help

	  If you say yes to this option, support will be included for the

	  Synopsys DesignWare I2C adapter. Only master mode is supported.
@@ -367,6 +372,7 @@ config I2C_DESIGNWARE_PLATFORM 
config I2C_DESIGNWARE_PCI

	tristate "Synopsys DesignWare PCI"

	depends on PCI

	select I2C_DESIGNWARE_CORE

	help

	  If you say yes to this option, support will be included for the

	  Synopsys DesignWare I2C adapter. Only master mode is supported.

drivers/i2c/busses/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -33,10 +33,11 @@ obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o 
obj-$(CONFIG_I2C_BLACKFIN_TWI)	+= i2c-bfin-twi.o

obj-$(CONFIG_I2C_CPM)		+= i2c-cpm.o

obj-$(CONFIG_I2C_DAVINCI)	+= i2c-davinci.o

obj-$(CONFIG_I2C_DESIGNWARE_CORE)	+= i2c-designware-core.o

obj-$(CONFIG_I2C_DESIGNWARE_PLATFORM)	+= i2c-designware-platform.o

i2c-designware-platform-objs := i2c-designware-platdrv.o i2c-designware-core.o

i2c-designware-platform-objs := i2c-designware-platdrv.o

obj-$(CONFIG_I2C_DESIGNWARE_PCI)	+= i2c-designware-pci.o

i2c-designware-pci-objs := i2c-designware-pcidrv.o i2c-designware-core.o

i2c-designware-pci-objs := i2c-designware-pcidrv.o

obj-$(CONFIG_I2C_EG20T)		+= i2c-eg20t.o

obj-$(CONFIG_I2C_GPIO)		+= i2c-gpio.o

obj-$(CONFIG_I2C_HIGHLANDER)	+= i2c-highlander.o

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

+11 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
 * ----------------------------------------------------------------------------

 *

 */

#include <linux/export.h>

#include <linux/clk.h>

#include <linux/errno.h>

#include <linux/err.h>
@@ -316,6 +317,7 @@ int i2c_dw_init(struct dw_i2c_dev *dev) 
	dw_writel(dev, dev->master_cfg , DW_IC_CON);

	return 0;

}

EXPORT_SYMBOL_GPL(i2c_dw_init);



/*

 * Waiting for bus not busy
@@ -568,12 +570,14 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) 


	return ret;

}

EXPORT_SYMBOL_GPL(i2c_dw_xfer);



u32 i2c_dw_func(struct i2c_adapter *adap)

{

	struct dw_i2c_dev *dev = i2c_get_adapdata(adap);

	return dev->functionality;

}

EXPORT_SYMBOL_GPL(i2c_dw_func);



static u32 i2c_dw_read_clear_intrbits(struct dw_i2c_dev *dev)

{
@@ -678,17 +682,20 @@ irqreturn_t i2c_dw_isr(int this_irq, void *dev_id) 


	return IRQ_HANDLED;

}

EXPORT_SYMBOL_GPL(i2c_dw_isr);



void i2c_dw_enable(struct dw_i2c_dev *dev)

{

       /* Enable the adapter */

	dw_writel(dev, 1, DW_IC_ENABLE);

}

EXPORT_SYMBOL_GPL(i2c_dw_enable);



u32 i2c_dw_is_enabled(struct dw_i2c_dev *dev)

{

	return dw_readl(dev, DW_IC_ENABLE);

}

EXPORT_SYMBOL_GPL(i2c_dw_is_enabled);



void i2c_dw_disable(struct dw_i2c_dev *dev)

{
@@ -699,18 +706,22 @@ void i2c_dw_disable(struct dw_i2c_dev *dev) 
	dw_writel(dev, 0, DW_IC_INTR_MASK);

	dw_readl(dev, DW_IC_CLR_INTR);

}

EXPORT_SYMBOL_GPL(i2c_dw_disable);



void i2c_dw_clear_int(struct dw_i2c_dev *dev)

{

	dw_readl(dev, DW_IC_CLR_INTR);

}

EXPORT_SYMBOL_GPL(i2c_dw_clear_int);



void i2c_dw_disable_int(struct dw_i2c_dev *dev)

{

	dw_writel(dev, 0, DW_IC_INTR_MASK);

}

EXPORT_SYMBOL_GPL(i2c_dw_disable_int);



u32 i2c_dw_read_comp_param(struct dw_i2c_dev *dev)

{

	return dw_readl(dev, DW_IC_COMP_PARAM_1);

}

EXPORT_SYMBOL_GPL(i2c_dw_read_comp_param);

drivers/i2c/busses/i2c-i801.c

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
  DH89xxCC (PCH)        0x2330     32     hard     yes     yes     yes

  Panther Point (PCH)   0x1e22     32     hard     yes     yes     yes

  Lynx Point (PCH)      0x8c22     32     hard     yes     yes     yes

  Lynx Point-LP (PCH)   0x9c22     32     hard     yes     yes     yes



  Features supported by this driver:

  Software PEC                     no
@@ -155,6 +156,7 @@ 
#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS	0x2330

#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS	0x3b30

#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS	0x8c22

#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS	0x9c22



struct i801_priv {

	struct i2c_adapter adapter;
@@ -771,6 +773,7 @@ static DEFINE_PCI_DEVICE_TABLE(i801_ids) = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS) },

	{ 0, }

};