2
0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-08-31 06:15:15 +00:00

Drop special handling of SiS south bridge. Since kernel 2.6.5, the quirk

is handled in the kernel directly.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5480 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2008-11-30 20:41:44 +00:00
parent 03eac07cd9
commit 7a1b881a13

View File

@@ -212,6 +212,11 @@ $revision =~ s/ \([^()]*\)//;
devid => 0x8353,
procid => "VIA Technologies VX800/VX820 South Bridge",
driver => "i2c-viapro",
}, {
vendid => 0x1039,
devid => 0x0008,
procid => "Silicon Integrated Systems SIS5595",
driver => "i2c-sis5595",
}, {
vendid => 0x1039,
devid => 0x0630,
@@ -222,6 +227,11 @@ $revision =~ s/ \([^()]*\)//;
devid => 0x0730,
procid => "Silicon Integrated Systems SIS730",
driver => "i2c-sis630",
}, {
vendid => 0x1039,
devid => 0x0016,
procid => "Silicon Integrated Systems SMBus Controller",
driver => "i2c-sis96x",
}, {
# Both Ali chips below have same PCI ID. Can't be helped. Only one should load.
vendid => 0x10b9,
@@ -386,30 +396,6 @@ $revision =~ s/ \([^()]*\)//;
}
);
# The following entries used to appear directly in @pci_adapters.
# Because of the tendency of SiS chipsets to have their real PCI
# IDs obscured, we have to qualify these with a custom detection
# routine before we add them to the @pci_adapters list.
#
use vars qw(@pci_adapters_sis5595 @pci_adapters_sis96x);
@pci_adapters_sis5595 = (
{
vendid => 0x1039,
devid => 0x0008,
procid => "Silicon Integrated Systems SIS5595",
driver => "i2c-sis5595",
}
);
@pci_adapters_sis96x = (
{
vendid => 0x1039,
devid => 0x0016,
procid => "Silicon Integrated Systems SMBus Controller",
driver => "i2c-sis96x",
}
);
# Look-up table to find out an I2C bus' driver based on the bus name.
# The match field should contain a regular expression matching the I2C
# bus name as it would appear in /sys/class/i2c-adapter.
@@ -2163,17 +2149,6 @@ sub initialize_pci
# ADAPTER DETECTION #
#####################
# Not sure if we still need this for Linux 2.6?
sub adapter_pci_detection_sis_96x
{
# Add the appropriate entries to @pci_adapters
if (exists $pci_list{'1039:0016'}) {
push @pci_adapters, @pci_adapters_sis96x;
} elsif (exists $pci_list{'1039:0008'}) {
push @pci_adapters, @pci_adapters_sis5595;
}
}
# Build and return a PCI device's bus ID
sub pci_busid
{
@@ -2193,9 +2168,6 @@ sub adapter_pci_detection
my ($key, $device, $try, %smbus, $count);
print "Probing for PCI bus adapters...\n";
# Custom detection routine for some SiS chipsets
adapter_pci_detection_sis_96x();
# Build a list of detected SMBus devices
foreach $key (keys %pci_list) {
$device = $pci_list{$key};