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

Commit 44234d0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2637/i2c-all' of git://git.fluff.org/bjdooks/linux 

* 'for-2637/i2c-all' of git://git.fluff.org/bjdooks/linux:
  i2c-intel-mid: Driver depends on PCI
  i2c-intel-mid: support for Moorestown and Medfield platform
  i2c-nomadik: fixup bus delays
  i2c-nomadik: support smbus emulation
  i2c-nomadik: dynamic clocking
  i2c-nomadik: documentation fixes
  i2c-s3c2410: Enable i2c clock only when doing some transfert
parents 91ab9bf7 9cc11dee

drivers/i2c/busses/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -396,6 +396,16 @@ config I2C_IMX 
	  This driver can also be built as a module.  If so, the module

	  will be called i2c-imx.



config I2C_INTEL_MID

	tristate "Intel Moorestown/Medfield Platform I2C controller"

	depends on PCI

	help

	  Say Y here if you have an Intel Moorestown/Medfield platform I2C

	  controller.



	  This support is also available as a module. If so, the module

	  will be called i2c-intel-mid.



config I2C_IOP3XX

	tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"

	depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX

drivers/i2c/busses/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ obj-$(CONFIG_I2C_GPIO) += i2c-gpio.o 
obj-$(CONFIG_I2C_HIGHLANDER)	+= i2c-highlander.o

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

obj-$(CONFIG_I2C_IMX)		+= i2c-imx.o

obj-$(CONFIG_I2C_INTEL_MID)	+= i2c-intel-mid.o

obj-$(CONFIG_I2C_IOP3XX)	+= i2c-iop3xx.o

obj-$(CONFIG_I2C_IXP2000)	+= i2c-ixp2000.o

obj-$(CONFIG_I2C_MPC)		+= i2c-mpc.o