diff options
author | Gaston, Jason D <jason.d.gaston@intel.com> | 2008-02-24 14:03:42 -0500 |
---|---|---|
committer | Jean Delvare <khali@hyperion.delvare> | 2008-02-24 14:03:42 -0500 |
commit | d28dc711217a2d5cafb64ec4e33a469b01376d91 (patch) | |
tree | 7f8ecb7a2227ed0d3d38f00b20c2b662311ab65d /drivers | |
parent | 263867631ea02741baf878ca9faaf94b1563b9d7 (diff) |
i2c-i801: Add support for the ICH10
Add the Intel ICH10 SMBus Controller DeviceID's and updates
Tolapai support.
Signed-off-by: Jason Gaston <jason.d.gaston@intel.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/busses/Kconfig | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-i801.c | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index b61f56b6f311..476b0bb72d6c 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
@@ -177,6 +177,8 @@ config I2C_I801 | |||
177 | ESB2 | 177 | ESB2 |
178 | ICH8 | 178 | ICH8 |
179 | ICH9 | 179 | ICH9 |
180 | Tolapai | ||
181 | ICH10 | ||
180 | 182 | ||
181 | This driver can also be built as a module. If so, the module | 183 | This driver can also be built as a module. If so, the module |
182 | will be called i2c-i801. | 184 | will be called i2c-i801. |
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index aa9157913b9a..b0f771fe4326 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c | |||
@@ -40,7 +40,9 @@ | |||
40 | 82801G (ICH7) 0x27da 32 hard yes yes yes | 40 | 82801G (ICH7) 0x27da 32 hard yes yes yes |
41 | 82801H (ICH8) 0x283e 32 hard yes yes yes | 41 | 82801H (ICH8) 0x283e 32 hard yes yes yes |
42 | 82801I (ICH9) 0x2930 32 hard yes yes yes | 42 | 82801I (ICH9) 0x2930 32 hard yes yes yes |
43 | Tolapai 0x5032 32 hard yes ? ? | 43 | Tolapai 0x5032 32 hard yes yes yes |
44 | ICH10 0x3a30 32 hard yes yes yes | ||
45 | ICH10 0x3a60 32 hard yes yes yes | ||
44 | 46 | ||
45 | Features supported by this driver: | 47 | Features supported by this driver: |
46 | Software PEC no | 48 | Software PEC no |
@@ -588,6 +590,8 @@ static struct pci_device_id i801_ids[] = { | |||
588 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) }, | 590 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) }, |
589 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) }, | 591 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) }, |
590 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) }, | 592 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) }, |
593 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, | ||
594 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, | ||
591 | { 0, } | 595 | { 0, } |
592 | }; | 596 | }; |
593 | 597 | ||
@@ -608,10 +612,12 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id | |||
608 | case PCI_DEVICE_ID_INTEL_ESB2_17: | 612 | case PCI_DEVICE_ID_INTEL_ESB2_17: |
609 | case PCI_DEVICE_ID_INTEL_ICH8_5: | 613 | case PCI_DEVICE_ID_INTEL_ICH8_5: |
610 | case PCI_DEVICE_ID_INTEL_ICH9_6: | 614 | case PCI_DEVICE_ID_INTEL_ICH9_6: |
615 | case PCI_DEVICE_ID_INTEL_TOLAPAI_1: | ||
616 | case PCI_DEVICE_ID_INTEL_ICH10_4: | ||
617 | case PCI_DEVICE_ID_INTEL_ICH10_5: | ||
611 | i801_features |= FEATURE_I2C_BLOCK_READ; | 618 | i801_features |= FEATURE_I2C_BLOCK_READ; |
612 | /* fall through */ | 619 | /* fall through */ |
613 | case PCI_DEVICE_ID_INTEL_82801DB_3: | 620 | case PCI_DEVICE_ID_INTEL_82801DB_3: |
614 | case PCI_DEVICE_ID_INTEL_TOLAPAI_1: | ||
615 | i801_features |= FEATURE_SMBUS_PEC; | 621 | i801_features |= FEATURE_SMBUS_PEC; |
616 | i801_features |= FEATURE_BLOCK_BUFFER; | 622 | i801_features |= FEATURE_BLOCK_BUFFER; |
617 | break; | 623 | break; |