aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 19:39:23 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 19:39:23 -0400
commit4a7df24ddc7097cd789a7527187826552ea0765e (patch)
tree2e70557e1d8e6d971ee6094de823900df1f8288e /drivers/i2c/busses/Kconfig
parent37d8cb5478651b27779b9a80d024c614c452eae3 (diff)
parent5bdfdfeed5eed599a3ddc455f7c254a209ceae8d (diff)
Merge branch 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux
* 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux: (21 commits) mach-ux500: set proper I2C platform data from MOP500s i2c-nomadik: break out single messsage transmission i2c-nomadik: reset the hw after status check i2c-nomadik: remove the unnecessary delay i2c-nomadik: change the TX and RX threshold i2c-nomadik: add code to retry on timeout failure i2c-nomadik: use pm_runtime API i2c-nomadik: print abort cause only on abort tag i2c-nomadik: correct adapter timeout initialization i2c-nomadik: remove the redundant error message i2c-nomadik: corrrect returned error numbers i2c-nomadik: fix speed enumerator i2c-nomadik: make i2c timeout specific per i2c bus i2c-nomadik: add regulator support i2c: i2c-sh_mobile bus speed platform data V2 i2c: i2c-sh_mobile clock string removal i2c-eg20t: Support new device ML7223 IOH i2c: tegra: Add de-bounce cycles. i2c: tegra: fix repeated start handling i2c: tegra: recover from spurious interrupt storm ...
Diffstat (limited to 'drivers/i2c/busses/Kconfig')
-rw-r--r--drivers/i2c/busses/Kconfig10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 428d098c35ef..646068e5100b 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -673,15 +673,19 @@ config I2C_XILINX
673 will be called xilinx_i2c. 673 will be called xilinx_i2c.
674 674
675config I2C_EG20T 675config I2C_EG20T
676 tristate "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH" 676 tristate "Intel EG20T PCH / OKI SEMICONDUCTOR IOH(ML7213/ML7223)"
677 depends on PCI 677 depends on PCI
678 help 678 help
679 This driver is for PCH(Platform controller Hub) I2C of EG20T which 679 This driver is for PCH(Platform controller Hub) I2C of EG20T which
680 is an IOH(Input/Output Hub) for x86 embedded processor. 680 is an IOH(Input/Output Hub) for x86 embedded processor.
681 This driver can access PCH I2C bus device. 681 This driver can access PCH I2C bus device.
682 682
683 This driver also supports the ML7213, a companion chip for the 683 This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
684 Atom E6xx series and compatible with the Intel EG20T PCH. 684 Output Hub), ML7213 and ML7223.
685 ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is
686 for MP(Media Phone) use.
687 ML7213/ML7223 is companion chip for Intel Atom E6xx series.
688 ML7213/ML7223 is completely compatible for Intel EG20T PCH.
685 689
686comment "External I2C/SMBus adapter drivers" 690comment "External I2C/SMBus adapter drivers"
687 691