diff options
-rw-r--r-- | Documentation/i2c/busses/i2c-i801 | 7 | ||||
-rw-r--r-- | drivers/i2c/busses/Kconfig | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-i801.c | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801 index c31e0291e167..81c0c59a60ea 100644 --- a/Documentation/i2c/busses/i2c-i801 +++ b/Documentation/i2c/busses/i2c-i801 | |||
@@ -13,8 +13,9 @@ Supported adapters: | |||
13 | * Intel 631xESB/632xESB (ESB2) | 13 | * Intel 631xESB/632xESB (ESB2) |
14 | * Intel 82801H (ICH8) | 14 | * Intel 82801H (ICH8) |
15 | * Intel 82801I (ICH9) | 15 | * Intel 82801I (ICH9) |
16 | * Intel Tolapai | 16 | * Intel EP80579 (Tolapai) |
17 | * Intel ICH10 | 17 | * Intel 82801JI (ICH10) |
18 | * Intel PCH | ||
18 | Datasheets: Publicly available at the Intel website | 19 | Datasheets: Publicly available at the Intel website |
19 | 20 | ||
20 | Authors: | 21 | Authors: |
@@ -32,7 +33,7 @@ Description | |||
32 | ----------- | 33 | ----------- |
33 | 34 | ||
34 | The ICH (properly known as the 82801AA), ICH0 (82801AB), ICH2 (82801BA), | 35 | The ICH (properly known as the 82801AA), ICH0 (82801AB), ICH2 (82801BA), |
35 | ICH3 (82801CA/CAM) and later devices are Intel chips that are a part of | 36 | ICH3 (82801CA/CAM) and later devices (PCH) are Intel chips that are a part of |
36 | Intel's '810' chipset for Celeron-based PCs, '810E' chipset for | 37 | Intel's '810' chipset for Celeron-based PCs, '810E' chipset for |
37 | Pentium-based PCs, '815E' chipset, and others. | 38 | Pentium-based PCs, '815E' chipset, and others. |
38 | 39 | ||
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index acadbc51fc0f..7f95905bbb9d 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
@@ -97,6 +97,7 @@ config I2C_I801 | |||
97 | ICH9 | 97 | ICH9 |
98 | Tolapai | 98 | Tolapai |
99 | ICH10 | 99 | ICH10 |
100 | PCH | ||
100 | 101 | ||
101 | This driver can also be built as a module. If so, the module | 102 | This driver can also be built as a module. If so, the module |
102 | will be called i2c-i801. | 103 | will be called i2c-i801. |
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index dc7ea32b69a8..5123eb69a971 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c | |||
@@ -41,6 +41,7 @@ | |||
41 | Tolapai 0x5032 32 hard yes yes yes | 41 | Tolapai 0x5032 32 hard yes yes yes |
42 | ICH10 0x3a30 32 hard yes yes yes | 42 | ICH10 0x3a30 32 hard yes yes yes |
43 | ICH10 0x3a60 32 hard yes yes yes | 43 | ICH10 0x3a60 32 hard yes yes yes |
44 | PCH 0x3b30 32 hard yes yes yes | ||
44 | 45 | ||
45 | Features supported by this driver: | 46 | Features supported by this driver: |
46 | Software PEC no | 47 | Software PEC no |
@@ -576,6 +577,7 @@ static struct pci_device_id i801_ids[] = { | |||
576 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) }, | 577 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) }, |
577 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, | 578 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, |
578 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, | 579 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, |
580 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, | ||
579 | { 0, } | 581 | { 0, } |
580 | }; | 582 | }; |
581 | 583 | ||
@@ -599,6 +601,7 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id | |||
599 | case PCI_DEVICE_ID_INTEL_TOLAPAI_1: | 601 | case PCI_DEVICE_ID_INTEL_TOLAPAI_1: |
600 | case PCI_DEVICE_ID_INTEL_ICH10_4: | 602 | case PCI_DEVICE_ID_INTEL_ICH10_4: |
601 | case PCI_DEVICE_ID_INTEL_ICH10_5: | 603 | case PCI_DEVICE_ID_INTEL_ICH10_5: |
604 | case PCI_DEVICE_ID_INTEL_PCH_SMBUS: | ||
602 | i801_features |= FEATURE_I2C_BLOCK_READ; | 605 | i801_features |= FEATURE_I2C_BLOCK_READ; |
603 | /* fall through */ | 606 | /* fall through */ |
604 | case PCI_DEVICE_ID_INTEL_82801DB_3: | 607 | case PCI_DEVICE_ID_INTEL_82801DB_3: |