diff --git a/CHANGES b/CHANGES index 0240333d..248cb4fb 100644 --- a/CHANGES +++ b/CHANGES @@ -26,7 +26,8 @@ ask CVS about it: File doc/chips/via686a: Claim support for 686b. File sensors.conf.eg: Adjust as99127f in5 (-12V) and temp2 calculations; Add lm87, adm9240, ds1780, lm81 templates; - Enhance help comments in file + Enhance help comments in file; + Add Tyan S2510 dual-MTP008 example. File sensors.c: Add xxx_init() calls for drivers added to mkpatch in 2.5.5. Include file i2c-isa.h: No longer required, moved to i2c.h in i2c package Include file sensors.h: Most contents moved to i2c-proc.h in i2c package @@ -40,6 +41,8 @@ ask CVS about it: Save BIOS pin configuration of temps and fans Module sensors: Disabled, moved to i2c package as i2c-proc.c Module via686a: Allow force=9191,address (for A7V/K7V boards) + Module w83781d: Don't reinitialize as99127f chip; this may cause fan/temp + reading changes Program mkpatch.pl: Fix adm9240 typos, add more chips to Configure.help Program sensord: Add -d (debug) and -p (pid-file) options Program sensors: Change reported version from 1.3 to the lm_sensors version; diff --git a/doc/chips/mtp008 b/doc/chips/mtp008 index 1d09e002..f22a96e6 100644 --- a/doc/chips/mtp008 +++ b/doc/chips/mtp008 @@ -1,7 +1,7 @@ Kernel driver `mtp008.o' ========================= -Status: Complete; Alpha. +Status: Complete; Beta. This chip is quite configurable and many settings cannot be done through the driver. Hopefully the BIOS settings will be correct for most motherboards. @@ -39,6 +39,10 @@ AIN5 is hooked up to the -12V sensing circuit. Other Tyan motherboards (the 2510 Thunder and the Tiger 200) appear to have different configurations. +For the 2510, which has two MTP008 chips, each with a different +configuration, follow the instructions in the mtp008 section of +etc/sensors.conf.eg to configure 'sensors' correctly. + The PWM outputs are configurable but not via the driver. The Fan input types (2 wire or 3 wire) are configurable but not via the driver. diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg index 30de6bb7..6985f745 100644 --- a/etc/sensors.conf.eg +++ b/etc/sensors.conf.eg @@ -688,8 +688,9 @@ chip "via686a-*" chip "mtp008-*" -# The values below should be correct if you own a Tyan S1834D motherboard. If -# not, please contact us, so we can figure out better readings. +# The values below should be correct if you own a Tyan S1834D motherboard. +# If not, please contact us, so we can figure out better readings. +# FOR TYAN S2510 SEE END OF THIS SECTION. # For positive voltages outside the 0..4.09V range (in2..in4), two resistors # are used, with the following formula (R1,R2: resistor values, Vs: read @@ -713,9 +714,9 @@ chip "mtp008-*" label in5 "-12V" label in6 "Vtt" - label fan1 "CPUFAN1" - label fan2 "CPUFAN2" - label fan3 "CPUFAN3" + label fan1 "CPU1 Fan" + label fan2 "CPU2 Fan" + label fan3 "fan3" label temp1 "CPU1 Temp" label temp2 "CPU2 Temp" @@ -732,6 +733,53 @@ chip "mtp008-*" # set temp3_over 52 # set temp3_hyst 47 +# End of standard mtp008 configuration + +# TYAN S2510 INFORMATION +# This motherboard has two mtp008's which are hooked up differently, +# so they must be configured separately. +# For this motherboard, COMMENT OUT the above mtp008 section and +# UNCOMMENT the following two sections. +# +#chip mtp008-i2c-*-2c +# label in0 "VCore1" +# set in0_min 1.60 +# set in0_max 1.80 +# label in1 "+3.3V" +# label in2 "+12V" +# label in3 "Vcore2" +# set in3_min 1.60 +# set in3_max 1.80 +# ignore in4 +# label in5 "-12V" +# label in6 "Vtt" +# label fan1 "CPU1 Fan" +# label fan2 "CPU2 Fan" +# label fan3 "fan3" +# label temp1 "CPU1 Temp" +# label temp2 "CPU2 Temp" +# ignore temp3 +# compute in2 @ * 38 / 10, @ * 10 / 38 +# compute in5 (@ * 36 - 118.61) / 7, (118.61 + 7 * @) / 36 +# +#chip mtp008-i2c-*-2e +# ignore in0 +# label in1 "+3.3V" +# ignore in2 +# label in3 "+5V" +# set in3_min 4.50 +# set in3_max 5.50 +# ignore in4 +# label in5 "+3.3V" +# ignore in6 +# label fan1 "fan4" +# label fan2 "fan5" +# label fan3 "fan6" +# ignore temp1 +# label temp2 "MB Temp" +# set temp2_over 52 +# set temp2_hyst 47 +# ignore temp3 chip "adm1025-*"