Commit ce0fda16 authored by Ben Dooks's avatar Ben Dooks
Browse files

Merge branches 'for-32/i2c/omap-v4', 'for-32/i2c/imx-dt',... 

Merge branches 'for-32/i2c/omap-v4', 'for-32/i2c/imx-dt', 'for-32/i2c/eg20t-v4', 'for-32/i2c/designware-v5' and 'for-32/i2c/au1550' into for-linus/i2c-3.2
parents c9c7ae40 dfcd04b1 24597bf8 52c28433 46f344e2

Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
* Freescale Inter IC (I2C) and High Speed Inter IC (HS-I2C) for i.MX



Required properties:

- compatible : Should be "fsl,<chip>-i2c"

- reg : Should contain I2C/HS-I2C registers location and length

- interrupts : Should contain I2C/HS-I2C interrupt



Optional properties:

- clock-frequency : Constains desired I2C/HS-I2C bus clock frequency in Hz.

  The absence of the propoerty indicates the default frequency 100 kHz.



Examples:



i2c@83fc4000 { /* I2C2 on i.MX51 */

	compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";

	reg = <0x83fc4000 0x4000>;

	interrupts = <63>;

};



i2c@70038000 { /* HS-I2C on i.MX51 */

	compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";

	reg = <0x70038000 0x4000>;

	interrupts = <64>;

	clock-frequency = <400000>;

};

arch/arm/plat-mxc/include/mach/i2c.h

+0 −4
Original line number Diff line number Diff line
@@ -11,14 +11,10 @@ 


/**

 * struct imxi2c_platform_data - structure of platform data for MXC I2C driver

 * @init:	Initialise gpio's and other board specific things

 * @exit:	Free everything initialised by @init

 * @bitrate:	Bus speed measured in Hz

 *

 **/

struct imxi2c_platform_data {

	int (*init)(struct device *dev);

	void (*exit)(struct device *dev);

	int bitrate;

};

arch/mips/include/asm/mach-au1x00/au1xxx_psc.h

+0 −13
Original line number Diff line number Diff line
@@ -394,19 +394,6 @@ typedef struct psc_spi { 
#define PSC_SPITXRX_LC		(1 << 29)

#define PSC_SPITXRX_SR		(1 << 28)



/* PSC in SMBus (I2C) Mode. */

typedef struct	psc_smb {

	u32	psc_sel;

	u32	psc_ctrl;

	u32	psc_smbcfg;

	u32	psc_smbmsk;

	u32	psc_smbpcr;

	u32	psc_smbstat;

	u32	psc_smbevnt;

	u32	psc_smbtxrx;

	u32	psc_smbtmr;

} psc_smb_t;



/* SMBus Config Register. */

#define PSC_SMBCFG_RT_MASK	(3 << 30)

#define PSC_SMBCFG_RT_FIFO1	(0 << 30)

drivers/i2c/busses/Kconfig

+13 −3
Original line number Diff line number Diff line
@@ -350,15 +350,25 @@ config I2C_DAVINCI 
	  devices such as DaVinci NIC.

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



config I2C_DESIGNWARE

	tristate "Synopsys DesignWare"

config I2C_DESIGNWARE_PLATFORM

	tristate "Synopsys DesignWare Platfrom"

	depends on HAVE_CLK

	help

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

	  Synopsys DesignWare I2C adapter. Only master mode is supported.



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

	  will be called i2c-designware.

	  will be called i2c-designware-platform.



config I2C_DESIGNWARE_PCI

	tristate "Synopsys DesignWare PCI"

	depends on PCI

	help

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

	  Synopsys DesignWare I2C adapter. Only master mode is supported.



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

	  will be called i2c-designware-pci.



config I2C_GPIO

	tristate "GPIO-based bitbanging I2C"

drivers/i2c/busses/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -33,7 +33,10 @@ 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)	+= i2c-designware.o

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

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

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

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

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

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

obj-$(CONFIG_I2C_IBM_IIC)	+= i2c-ibm_iic.o