projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 00e5a55c BS |
1 | From: Seth Heasley <seth.heasley@intel.com> |
| 2 | Date: Wed, 22 Oct 2008 18:21:29 +0000 (+0200) | |
| 3 | Subject: i2c-i801: Add support for Intel Ibex Peak | |
| 4 | X-Git-Tag: v2.6.28-rc1~32^2~14 | |
| 5 | X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c429a247f56d277f12eaffd6525922353e9539a5 | |
| 6 | References: bnc#415383 | |
| 7 | ||
| 8 | i2c-i801: Add support for Intel Ibex Peak | |
| 9 | ||
| 10 | Adds the Intel Ibex Peak (PCH) SMBus Controller Device IDs. | |
| 11 | ||
| 12 | Signed-off-by: Seth Heasley <seth.heasley@intel.com> | |
| 13 | Signed-off-by: Jean Delvare <khali@linux-fr.org> | |
| 14 | Acked-by: John Jolly <jjolly@suse.de> | |
| 15 | --- | |
| 16 | ||
| 17 | diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801 | |
| 18 | index c31e029..81c0c59 100644 | |
| 19 | --- a/Documentation/i2c/busses/i2c-i801 | |
| 20 | +++ b/Documentation/i2c/busses/i2c-i801 | |
| 21 | @@ -13,8 +13,9 @@ Supported adapters: | |
| 22 | * Intel 631xESB/632xESB (ESB2) | |
| 23 | * Intel 82801H (ICH8) | |
| 24 | * Intel 82801I (ICH9) | |
| 25 | - * Intel Tolapai | |
| 26 | - * Intel ICH10 | |
| 27 | + * Intel EP80579 (Tolapai) | |
| 28 | + * Intel 82801JI (ICH10) | |
| 29 | + * Intel PCH | |
| 30 | Datasheets: Publicly available at the Intel website | |
| 31 | ||
| 32 | Authors: | |
| 33 | @@ -32,7 +33,7 @@ Description | |
| 34 | ----------- | |
| 35 | ||
| 36 | The ICH (properly known as the 82801AA), ICH0 (82801AB), ICH2 (82801BA), | |
| 37 | -ICH3 (82801CA/CAM) and later devices are Intel chips that are a part of | |
| 38 | +ICH3 (82801CA/CAM) and later devices (PCH) are Intel chips that are a part of | |
| 39 | Intel's '810' chipset for Celeron-based PCs, '810E' chipset for | |
| 40 | Pentium-based PCs, '815E' chipset, and others. | |
| 41 | ||
| 42 | diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig | |
| 43 | index acadbc5..7f95905 100644 | |
| 44 | --- a/drivers/i2c/busses/Kconfig | |
| 45 | +++ b/drivers/i2c/busses/Kconfig | |
| 46 | @@ -97,6 +97,7 @@ config I2C_I801 | |
| 47 | ICH9 | |
| 48 | Tolapai | |
| 49 | ICH10 | |
| 50 | + PCH | |
| 51 | ||
| 52 | This driver can also be built as a module. If so, the module | |
| 53 | will be called i2c-i801. | |
| 54 | diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c | |
| 55 | index dc7ea32..5123eb6 100644 | |
| 56 | --- a/drivers/i2c/busses/i2c-i801.c | |
| 57 | +++ b/drivers/i2c/busses/i2c-i801.c | |
| 58 | @@ -41,6 +41,7 @@ | |
| 59 | Tolapai 0x5032 32 hard yes yes yes | |
| 60 | ICH10 0x3a30 32 hard yes yes yes | |
| 61 | ICH10 0x3a60 32 hard yes yes yes | |
| 62 | + PCH 0x3b30 32 hard yes yes yes | |
| 63 | ||
| 64 | Features supported by this driver: | |
| 65 | Software PEC no | |
| 66 | @@ -576,6 +577,7 @@ static struct pci_device_id i801_ids[] = { | |
| 67 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) }, | |
| 68 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, | |
| 69 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, | |
| 70 | + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, | |
| 71 | { 0, } | |
| 72 | }; | |
| 73 | ||
| 74 | @@ -599,6 +601,7 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id | |
| 75 | case PCI_DEVICE_ID_INTEL_TOLAPAI_1: | |
| 76 | case PCI_DEVICE_ID_INTEL_ICH10_4: | |
| 77 | case PCI_DEVICE_ID_INTEL_ICH10_5: | |
| 78 | + case PCI_DEVICE_ID_INTEL_PCH_SMBUS: | |
| 79 | i801_features |= FEATURE_I2C_BLOCK_READ; | |
| 80 | /* fall through */ | |
| 81 | case PCI_DEVICE_ID_INTEL_82801DB_3: |