Update of /cvsroot/gc-linux/linux/drivers/i2c/busses
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/i2c/busses
Modified Files:
Kconfig Makefile
Log Message:
Forward to v2.6.31.
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile 25 Oct 2009 18:53:45 -0000 1.7
--- Makefile 25 Oct 2009 18:56:56 -0000 1.8
***************
*** 31,34 ****
--- 31,35 ----
obj-$(CONFIG_I2C_CPM) += i2c-cpm.o
obj-$(CONFIG_I2C_DAVINCI) += i2c-davinci.o
+ obj-$(CONFIG_I2C_DESIGNWARE) += i2c-designware.o
obj-$(CONFIG_I2C_GPIO) += i2c-gpio.o
obj-$(CONFIG_I2C_HIGHLANDER) += i2c-highlander.o
***************
*** 49,52 ****
--- 50,54 ----
obj-$(CONFIG_I2C_SH_MOBILE) += i2c-sh_mobile.o
obj-$(CONFIG_I2C_SIMTEC) += i2c-simtec.o
+ obj-$(CONFIG_I2C_STU300) += i2c-stu300.o
obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Kconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Kconfig 25 Oct 2009 18:53:45 -0000 1.7
--- Kconfig 25 Oct 2009 18:56:56 -0000 1.8
***************
*** 212,216 ****
config I2C_VIAPRO
! tristate "VIA VT82C596/82C686/82xx and CX700/VX800/VX820"
depends on PCI
help
--- 212,216 ----
config I2C_VIAPRO
! tristate "VIA VT82C596/82C686/82xx and CX700/VX8xx"
depends on PCI
help
***************
*** 226,231 ****
VT8251
CX700
! VX800
! VX820
This driver can also be built as a module. If so, the module
--- 226,231 ----
VT8251
CX700
! VX800/VX820
! VX855/VX875
This driver can also be built as a module. If so, the module
***************
*** 299,303 ****
int "Blackfin TWI I2C clock (kHz)"
depends on I2C_BLACKFIN_TWI
! range 10 400
default 50
help
--- 299,303 ----
int "Blackfin TWI I2C clock (kHz)"
depends on I2C_BLACKFIN_TWI
! range 21 400
default 50
help
***************
*** 327,330 ****
--- 327,340 ----
For details please see http://www.ti.com/davinci
+ config I2C_DESIGNWARE
+ tristate "Synopsys DesignWare"
+ 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.
+
config I2C_GPIO
tristate "GPIO-based bitbanging I2C"
***************
*** 514,517 ****
--- 524,540 ----
will be called i2c-simtec.
+ config I2C_STU300
+ tristate "ST Microelectronics DDC I2C interface"
+ depends on MACH_U300
+ default y if MACH_U300
+ help
+ If you say yes to this option, support will be included for the
+ I2C interface from ST Microelectronics simply called "DDC I2C"
+ supporting both I2C and DDC, used in e.g. the U300 series
+ mobile platforms.
+
+ This driver can also be built as a module. If so, the module
+ will be called i2c-stu300.
+
config I2C_VERSATILE
tristate "ARM Versatile/Realview I2C bus support"
|
