diff --git a/CHANGES b/CHANGES index 7f4e353d..54c1248f 100644 --- a/CHANGES +++ b/CHANGES @@ -17,6 +17,10 @@ ask CVS about it: ----------------------------------------------------------------------------- +2.8.7 (2004xxxx) + Module i2c-sis645: Add support for SiS655 + + 2.8.6 (20040405) File README.thinkpad: Update status File doc/chips/pca9540: New @@ -54,7 +58,7 @@ ask CVS about it: Add smart battery charger and manager detection Rework adm1021 and clones detection The PC87360, PC87363 and PC87364 Super I/O chips - now have a (preliminary) driver + now have a (preliminary) driver Rework Super I/O detection Better support of devfs Program sensors-detect-stat.pl: New diff --git a/doc/busses/i2c-sis645 b/doc/busses/i2c-sis645 index 14af6f1d..61b765cd 100644 --- a/doc/busses/i2c-sis645 +++ b/doc/busses/i2c-sis645 @@ -5,7 +5,7 @@ Status: Beta Supported adapters: * Silicon Integrated Systems Corp (SiS) Any combination of these host bridges: - 645, 645DX (aka 646), 648, 650, 651, 735, 745, 746 + 645, 645DX (aka 646), 648, 650, 651, 655, 735, 745, 746 and these south bridges: 961, 962, 963(L) @@ -78,6 +78,8 @@ Robert Zwerus - testing for SiS645DX Kianusch Sayah Karadji - patch for SiS645DX/962 +Ken Healy + - patch for Sis655 To anyone else who has written w/ feedback, thanks! diff --git a/kernel/busses/i2c-sis645.c b/kernel/busses/i2c-sis645.c index 16725a6e..17060358 100644 --- a/kernel/busses/i2c-sis645.c +++ b/kernel/busses/i2c-sis645.c @@ -30,6 +30,10 @@ http://www2.lm-sensors.nu/~lm78/download.html */ +/* 25th March 2004 + Support for Sis655 chipsets added by Ken Healy +*/ + /* Note: we assume there can only be one SiS645 with one SMBus interface */ @@ -71,6 +75,11 @@ #define PCI_DEVICE_ID_SI_651 0x0651 #endif +/* SiS655 north bridge (defined in 2.4.22)*/ +#ifndef PCI_DEVICE_ID_SI_655 +#define PCI_DEVICE_ID_SI_655 0x0655 +#endif + /* SiS746 north bridge (defined in 2.4.21) */ #ifndef PCI_DEVICE_ID_SI_746 #define PCI_DEVICE_ID_SI_746 0x0746 @@ -260,6 +269,8 @@ static int __devinit sis645_hotplug_smbus(void) PCI_DEVICE_ID_SI_650, NULL)) && (NULL == pci_find_device(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_651, NULL)) + && (NULL == pci_find_device(PCI_VENDOR_ID_SI, + PCI_DEVICE_ID_SI_655, NULL)) && (NULL == pci_find_device(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_735, NULL)) && (NULL == pci_find_device(PCI_VENDOR_ID_SI,