aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorTomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>2011-10-27 20:40:10 -0400
committerBen Dooks <ben-linux@fluff.org>2012-01-17 18:29:52 -0500
commitc3f4661f55f86b541d23c66dbb53ce7b0a34e777 (patch)
tree53fa0ee91677afff667dba0f87a210d3314d4416 /drivers/i2c
parentff35e8b18984ad2a82cbd259fc07f0be4b34b1aa (diff)
i2c-eg20t: Support new device LAPIS Semiconductor ML7831 IOH
ML7831 is companion chip for Intel Atom E6xx series. Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/Kconfig14
-rw-r--r--drivers/i2c/busses/i2c-eg20t.c3
2 files changed, 10 insertions, 7 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index cbe7a2fb779f..3101dd59e379 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -682,19 +682,19 @@ config I2C_XILINX
682 will be called xilinx_i2c. 682 will be called xilinx_i2c.
683 683
684config I2C_EG20T 684config I2C_EG20T
685 tristate "Intel EG20T PCH / OKI SEMICONDUCTOR IOH(ML7213/ML7223)" 685 tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) I2C"
686 depends on PCI 686 depends on PCI
687 help 687 help
688 This driver is for PCH(Platform controller Hub) I2C of EG20T which 688 This driver is for PCH(Platform controller Hub) I2C of EG20T which
689 is an IOH(Input/Output Hub) for x86 embedded processor. 689 is an IOH(Input/Output Hub) for x86 embedded processor.
690 This driver can access PCH I2C bus device. 690 This driver can access PCH I2C bus device.
691 691
692 This driver also can be used for OKI SEMICONDUCTOR IOH(Input/ 692 This driver also can be used for LAPIS Semiconductor IOH(Input/
693 Output Hub), ML7213 and ML7223. 693 Output Hub), ML7213, ML7223 and ML7831.
694 ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is 694 ML7213 IOH is for IVI(In-Vehicle Infotainment) use, ML7223 IOH is
695 for MP(Media Phone) use. 695 for MP(Media Phone) use and ML7831 IOH is for general purpose use.
696 ML7213/ML7223 is companion chip for Intel Atom E6xx series. 696 ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.
697 ML7213/ML7223 is completely compatible for Intel EG20T PCH. 697 ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.
698 698
699comment "External I2C/SMBus adapter drivers" 699comment "External I2C/SMBus adapter drivers"
700 700
diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
index 357a66c66064..c72d7f998487 100644
--- a/drivers/i2c/busses/i2c-eg20t.c
+++ b/drivers/i2c/busses/i2c-eg20t.c
@@ -137,6 +137,7 @@
137Set the number of I2C instance max 137Set the number of I2C instance max
138Intel EG20T PCH : 1ch 138Intel EG20T PCH : 1ch
139OKI SEMICONDUCTOR ML7213 IOH : 2ch 139OKI SEMICONDUCTOR ML7213 IOH : 2ch
140OKI SEMICONDUCTOR ML7831 IOH : 1ch
140*/ 141*/
141#define PCH_I2C_MAX_DEV 2 142#define PCH_I2C_MAX_DEV 2
142 143
@@ -184,11 +185,13 @@ static DEFINE_MUTEX(pch_mutex);
184#define PCI_VENDOR_ID_ROHM 0x10DB 185#define PCI_VENDOR_ID_ROHM 0x10DB
185#define PCI_DEVICE_ID_ML7213_I2C 0x802D 186#define PCI_DEVICE_ID_ML7213_I2C 0x802D
186#define PCI_DEVICE_ID_ML7223_I2C 0x8010 187#define PCI_DEVICE_ID_ML7223_I2C 0x8010
188#define PCI_DEVICE_ID_ML7831_I2C 0x8817
187 189
188static DEFINE_PCI_DEVICE_TABLE(pch_pcidev_id) = { 190static DEFINE_PCI_DEVICE_TABLE(pch_pcidev_id) = {
189 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_I2C), 1, }, 191 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_I2C), 1, },
190 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_I2C), 2, }, 192 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_I2C), 2, },
191 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_I2C), 1, }, 193 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_I2C), 1, },
194 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_I2C), 1, },
192 {0,} 195 {0,}
193}; 196};
194 197