diff --git a/doc/chips/w83781d b/doc/chips/w83781d index 18193e69..1be44e80 100644 --- a/doc/chips/w83781d +++ b/doc/chips/w83781d @@ -9,8 +9,6 @@ Status: W83781D support is complete and well-tested. W83697HF support is complete but has not been well-tested. AS99127F support is BETA and has known problems due to lack of a chip datasheet. SEE BELOW. - ASB100 Bach support is BETA; presently this chip is treated - exactly like AS99127F. Supported chips: * Winbond W83781D @@ -23,11 +21,11 @@ Supported chips: Datasheet: Publicly available at the Winbond website * Winbond W83783S Prefix 'w83783s' - Addresses scanned: I2C 0x20 - 0x2f (inclusive) + Addresses scanned: I2C 0x2d Datasheet: Publicly available at the Winbond website * Winbond W83791D Prefix 'w83791d' - Addresses scanned: I2C 0x20 - 0x2f (inclusive) + Addresses scanned: I2C 0x2c - 0x2f (inclusive) Datasheet: Publicly available at the Winbond website * Winbond W83627HF Prefix 'w83627hf' @@ -39,11 +37,7 @@ Supported chips: Datasheet: Publicly available at the Winbond website * Asus AS99127F Prefix 'as99127f' - Addresses scanned: I2C 0x20 - 0x2f (inclusive) - Datasheet: Unavailable from Asus - * Asus ASB100 Bach - Prefix 'as99127f' - Addresses scanned: I2C 0x20 - 0x2f (inclusive) + Addresses scanned: I2C 0x28 - 0x2f (inclusive) Datasheet: Unavailable from Asus @@ -95,7 +89,7 @@ Description ----------- This driver implements support for the Winbond W83781D, W83782D, -W8783S, and W83627HF chips, and the Asus AS99127F/ASB100 chips. +W8783S, and W83627HF chips, and the Asus AS99127F chips. We will refer to them collectively as W8378* chips. There is quite some difference between these chips, but they are similar @@ -191,9 +185,9 @@ Known problems: cat /proc/bus/i2c to see a list of bus numbers) -AS99127F/ASB100 PROBLEMS +AS99127F PROBLEMS ----------------- -The as99127f/asb100 support was developed without the benefit of a datasheet. +The as99127f support was developed without the benefit of a datasheet. In most cases it is treated as a w83781d. This support will be BETA until a datasheet is released. One user has reported problems with fans stopping diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg index 0de12159..ca9f1987 100644 --- a/etc/sensors.conf.eg +++ b/etc/sensors.conf.eg @@ -698,9 +698,6 @@ chip "as99127f-*" # AS99127F rev.2 (same as w83782d) # compute in5 (5.14 * @) - 14.91 , (@ + 14.91) / 5.14 # compute in6 (3.14 * @) - 7.71 , (@ + 7.71) / 3.14 -# ASB100 Bach (contributed by Alex van Kaam) -# compute in5 -(240/60.4)*@ , -@/(240/60.4) -# compute in6 -(5/3)*@ , -@/(5/3) # Depending on your motherboard, you have to choose between three formulae # for temp2. Quoting Artur Gawryszczak: @@ -721,8 +718,6 @@ chip "as99127f-*" # to work for temp3. compute temp3 @*2.0, @/2.0 -# ASB100's temp4 isn't supported by the w83781d driver. - # Most Asus boards have temperatures settled like that: label temp1 "M/B Temp" label temp2 "CPU Temp" diff --git a/kernel/chips/w83781d.c b/kernel/chips/w83781d.c index db9e69c3..e4a2bdbe 100644 --- a/kernel/chips/w83781d.c +++ b/kernel/chips/w83781d.c @@ -26,7 +26,6 @@ Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA as99127f 7 3 1? 3 0x31 0x12c3 yes no as99127f rev.2 (type name = as99127f) 0x31 0x5ca3 yes no - asb100 "bach" (type_name = as99127f) 0x31 0x0694 yes no w83627hf 9 3 2 3 0x21 0x5ca3 yes yes(LPC) w83697hf 8 2 2 2 0x60 0x5ca3 no yes(LPC) w83781d 7 3 0 3 0x10-1 0x5ca3 yes yes @@ -856,15 +855,13 @@ static int w83781d_detect(struct i2c_adapter *adapter, int address, val2 = w83781d_read_value(new_client, W83781D_REG_CHIPMAN); /* Check for Winbond or Asus ID if in bank 0 */ if ((!(val1 & 0x07)) && - (((!(val1 & 0x80)) && (val2 != 0xa3) && (val2 != 0xc3) - && (val2 != 0x94)) - || ((val1 & 0x80) && (val2 != 0x5c) && (val2 != 0x12) - && (val2 != 0x06)))) { + (((!(val1 & 0x80)) && (val2 != 0xa3) && (val2 != 0xc3)) + || ((val1 & 0x80) && (val2 != 0x5c) && (val2 != 0x12)))) { err = -ENODEV; goto ERROR1; } - /* If Winbond SMBus, check address at 0x48. Asus doesn't support - except maybe (hopefully) for the as99127f rev.2 */ + /* If Winbond SMBus, check address at 0x48. + Asus doesn't support, except for the as99127f rev.2 */ if ((!is_isa) && (((!(val1 & 0x80)) && (val2 == 0xa3)) || ((val1 & 0x80) && (val2 == 0x5c)))) { if (w83781d_read_value @@ -888,7 +885,7 @@ static int w83781d_detect(struct i2c_adapter *adapter, int address, val2 = w83781d_read_value(new_client, W83781D_REG_CHIPMAN); if (val2 == 0x5c) vendid = winbond; - else if ((val2 == 0x12) || (val2 == 0x06)) + else if (val2 == 0x12) vendid = asus; else { err = -ENODEV;