diff options
54 files changed, 82 insertions, 82 deletions
@@ -65,7 +65,7 @@ ask CVS about it: Support VID on the IT8712F Module lm75: Only initialize CMP/INT bit Module lm78: Fix bug with setting negative temperature limits - Module lm85: Properly differenciate between ADM1027 and ADT7463 + Module lm85: Properly differentiate between ADM1027 and ADT7463 Add EMC6D102 support Module lm90: Fix MAX6657, MAX6658 and MAX6659 detection Add limited ADT7461 support diff --git a/doc/chips/adm1021 b/doc/chips/adm1021 index 1bd78093..7eab0270 100644 --- a/doc/chips/adm1021 +++ b/doc/chips/adm1021 @@ -115,7 +115,7 @@ indicates whether the remote sensor is connected. Each sensor has its own low and high limits. When they are crossed, the corresponding alarm is set and remains on as long as the temperature stays -out of range. Temperatures are measured in degrees Celcius. Measurements +out of range. Temperatures are measured in degrees Celsius. Measurements are possible between -65 and +127 degrees, with a resolution of one degree. The ADM1021 reports a die code, which is a sort of revision code. This @@ -379,7 +379,7 @@ Within each ADM1021 or MAX1617 directory, you can find the following files: A list of three numbers. The first number is the Overtemperature Shutdown value, the second number is Low limit value, and the third number is the current temperature. The first two values can be modified. Each value can - be set and read to full-degree accuracy. All values are in degrees Celcius. + be set and read to full-degree accuracy. All values are in degrees Celsius. An alarm is issued (usually to a connected ADM9240) when the temperature gets higher then the Overtemperature Shutdown value; it stays on until the temperature falls back below the Overtemperature Shutdown value. diff --git a/doc/chips/adm1026 b/doc/chips/adm1026 index 709d2f6c..1324b1a7 100644 --- a/doc/chips/adm1026 +++ b/doc/chips/adm1026 @@ -56,7 +56,7 @@ sensors (8-bit), an analog output and a PWM output along with limit, alarm and mask bits for all of the above. There is even 8k bytes of EEPROM memory on chip. -Temperatures are measured in degrees Celcius. There are two external +Temperatures are measured in degrees Celsius. There are two external sensor inputs and one internal sensor. Each sensor has a high and low limit. If the limit is exceeded, an interrupt (#SMBALERT) can be generated. The interrupts can be masked. In addition, there are diff --git a/doc/chips/adm1031 b/doc/chips/adm1031 index 06390df3..771c7c5f 100644 --- a/doc/chips/adm1031 +++ b/doc/chips/adm1031 @@ -51,7 +51,7 @@ ADM1030 and ADM1031 are digital temperature sensors and fan controllers. They sense their own temperature as well as the temperature of up to one (ADM1030) or two (ADM1031) external diodes. -All temperature values are given in degrees Celcius. Resolution +All temperature values are given in degrees Celsius. Resolution is 0.5 degree for the local temperature, 0.125 degree for the remote temperatures. diff --git a/doc/chips/adm9240 b/doc/chips/adm9240 index 7bf0b94c..315ec0ba 100644 --- a/doc/chips/adm9240 +++ b/doc/chips/adm9240 @@ -58,7 +58,7 @@ the speed with which they update their sensor readings. The chips implement six voltage sensors, a temperature sensor, two FAN rotation speed sensors, VID lines and some miscellaneous stuff. -Temperatures are measured in degrees Celcius. An alarm is triggered whenever +Temperatures are measured in degrees Celsius. An alarm is triggered whenever the temperature is above the hot limit, and will continue to be generated until the temperature has dropped beneath the hysteresis limit. Measurements are guaranteed between -40 and +125 degrees. The current temperature diff --git a/doc/chips/asb100 b/doc/chips/asb100 index 5447a0e3..7dc5e495 100644 --- a/doc/chips/asb100 +++ b/doc/chips/asb100 @@ -42,7 +42,7 @@ ASB100-A also implements a single PWM controller for fans 2 and 3 (i.e. one setting controls both.) If you have a plain ASB100, the pwm controller will simply not work (or maybe it will for you... it doesn't for me). -Temperatures are measured and reported in degrees Celcius. +Temperatures are measured and reported in degrees Celsius. Fan speeds are reported in RPM (rotations per minute). An alarm is triggered if the rotation speed has dropped below a programmable limit. diff --git a/doc/chips/ds1621 b/doc/chips/ds1621 index 242289db..163b5503 100644 --- a/doc/chips/ds1621 +++ b/doc/chips/ds1621 @@ -195,7 +195,7 @@ DS1621 is "running" or if in 1SHOT mode it is "shooting". In fact, the value returned here is the negated DONE bit, just like a "BUSY" flag. This means, that the "1" tells you that the values in REG_COUNT and REG_SLOPE are not valid. "0", on the other hand, means that the -continous conversion had been stopped long enough to provide valid +continuous conversion had been stopped long enough to provide valid readings and that one shot has successfully been fi- red, respectively. - Writing accepts "1" to start continuous conversion or to pull the trigger in 1SHOT mode, and "0" stops continuous conversion @@ -208,7 +208,7 @@ Last, but best try writing "0" to the "continuous" file and after that "1" to the "enable" file. This gives you the precise temperature with two digits after the radix (decimal point). The precise results are only updated if the DONE bit was set, thus you -have to stop continous conversion early enough prior to reading, +have to stop continuous conversion early enough prior to reading, i. e. 1000ms. And, on the other hand, you shouldn't forget to fire off 1SHOT in order to get the actual temperature rather than that of the day before yesterday. So read enable before any of these. diff --git a/doc/chips/fscher b/doc/chips/fscher index bb735f26..5db70faf 100644 --- a/doc/chips/fscher +++ b/doc/chips/fscher @@ -54,7 +54,7 @@ The chip provides three temperature values (CPU, motherboard and auxiliary), three voltage values (+12V, +5V and battery) and three fans (power supply, CPU and auxiliary). -Temperatures are measured in degrees Celcius. The resolution is 1 degree. +Temperatures are measured in degrees Celsius. The resolution is 1 degree. Fan rotation speeds are reported in RPM (rotations per minute). The value can be divided by a programmable divider (1, 2 or 4) which diff --git a/doc/chips/fscpos b/doc/chips/fscpos index cfe7f87e..9170d2f9 100644 --- a/doc/chips/fscpos +++ b/doc/chips/fscpos @@ -47,7 +47,7 @@ The chip provides three temperature values (cpu, motherboard and auxiliary), three current values (12 volt, 5 volt and battery) and three fans (power supply, cpu and auxiliary). -Temperatures are measured in degrees Celcius. The resolution is 1 degree. +Temperatures are measured in degrees Celsius. The resolution is 1 degree. FAN rotation speeds are reported in RPM (rotations per minute). The value can be divided by a programmable divider (1, 2, 4 or 8) which diff --git a/doc/chips/fscscy b/doc/chips/fscscy index a51d04e7..653d2603 100644 --- a/doc/chips/fscscy +++ b/doc/chips/fscscy @@ -59,7 +59,7 @@ The chip provides four temperature values (cpu0/1, motherboard and auxiliary), three current values (12 volt, 5 volt and battery) and up to six fans (power supply, cpu and auxiliary). -Temperatures are measured in degrees Celcius. The resolution is 1 degree. +Temperatures are measured in degrees Celsius. The resolution is 1 degree. In addition to state and actual temperature, the temperature sensors also export a LIMIT temperature for each sensor. The meaning of the information itself is obvious. The rest is guesswork. It likely triggers an alarm/event as soon as it is @@ -106,7 +106,7 @@ value I put there. It's always 0. Even if I write a non-zero value there, i got The third is the control register, with 5th (value 16), 6th (value 32) and 8th (value 128) bits used only. If I write 16 or 144 (128+16), it means system reset when the counter reaches 0. If I add 32 (for a value of 48 or 176), no -reset will occure. +reset will occur. So, the world's simplest watchdog using this mainboard: diff --git a/doc/chips/gl518sm b/doc/chips/gl518sm index ec63b660..6518d914 100644 --- a/doc/chips/gl518sm +++ b/doc/chips/gl518sm @@ -58,7 +58,7 @@ The GL518SM implements one temperature sensor, two FAN rotation speed sensors, and four voltage sensors. It can report alarms through the computer speakers. -Temperatures are measured in degrees Celcius. An alarm goes off while the +Temperatures are measured in degrees Celsius. An alarm goes off while the temperature is above the over temperature limit, and has not yet dropped below the hysteresis limit. The alarm always reflects the current situation. Measurements are guaranteed between -10 degrees and +110 degrees, with diff --git a/doc/chips/gl520sm b/doc/chips/gl520sm index 7f371f23..78824343 100644 --- a/doc/chips/gl520sm +++ b/doc/chips/gl520sm @@ -37,7 +37,7 @@ sensors, four voltage sensors and the cpu VID lines. In addition, one input can be configured as either a temperature or voltage sensor. The sensor can report alarms through the computer speakers. -Temperatures are measured in degrees Celcius. An alarm goes off while the +Temperatures are measured in degrees Celsius. An alarm goes off while the temperature is above the over temperature limit, and has not yet dropped below the hysteresis limit. The alarm always reflects the current situation. Measurements are guaranteed between 0 degrees and +110 degrees, with diff --git a/doc/chips/it87 b/doc/chips/it87 index f3727ee1..0d3a849e 100644 --- a/doc/chips/it87 +++ b/doc/chips/it87 @@ -55,7 +55,7 @@ they include an 'environmnent controller' with 3 temperature sensors, 3 fan rotation speed sensors, 8 voltage sensors, and associated alarms. The IT8712F additionally features VID inputs. -Temperatures are measured in degrees Celcius. An alarm is triggered once +Temperatures are measured in degrees Celsius. An alarm is triggered once when the Overtemperature Shutdown limit is crossed; it is triggered again as soon as it drops below the Hysteresis value. diff --git a/doc/chips/lm63 b/doc/chips/lm63 index c165bcaa..8e416492 100644 --- a/doc/chips/lm63 +++ b/doc/chips/lm63 @@ -44,7 +44,7 @@ Description The LM63 is a digital temperature sensor with integrated fan monitoring and control. -All temperature values are given in degrees Celcius. Resolution is 1.0 +All temperature values are given in degrees Celsius. Resolution is 1.0 degree for the local temperature, 0.125 degree for the remote temperature. The fan speed is measured using a tachometer. Contrary to most chips which diff --git a/doc/chips/lm75 b/doc/chips/lm75 index 191919cf..139e630e 100644 --- a/doc/chips/lm75 +++ b/doc/chips/lm75 @@ -65,7 +65,7 @@ set and read to half-degree accuracy. An alarm is issued (usually to a connected LM78) when the temperature gets higher then the Overtemperature Shutdown value; it stays on until the temperature falls below the Hysteresis value. -All temperatures are in degrees Celcius, and are guaranteed within a +All temperatures are in degrees Celsius, and are guaranteed within a range of -55 to +125 degrees. The LM75 only updates its values each 1.5 seconds; reading it more often diff --git a/doc/chips/lm78 b/doc/chips/lm78 index dbdf9d5d..f2b8fc30 100644 --- a/doc/chips/lm78 +++ b/doc/chips/lm78 @@ -58,10 +58,10 @@ From here on, LM7* means either of these three types. The LM7* implements one temperature sensor, three FAN rotation speed sensors, seven voltage sensors, VID lines, alarms, and some miscellaneous stuff. -Temperatures are measured in degrees Celcius. An alarm is triggered once +Temperatures are measured in degrees Celsius. An alarm is triggered once when the Overtemperature Shutdown limit is crossed; it is triggered again as soon as it drops below the Hysteresis value. A more useful behaviour -can be found by setting the Hysteresis value to +127 degrees Celcius; in +can be found by setting the Hysteresis value to +127 degrees Celsius; in this case, alarms are issued during all the time when the actual temperature is above the Overtemperature Shutdown value. Measurements are guaranteed between -55 and +125 degrees, with a resolution of 1 degree. diff --git a/doc/chips/lm80 b/doc/chips/lm80 index 1a4f5e5f..91e1f2c4 100644 --- a/doc/chips/lm80 +++ b/doc/chips/lm80 @@ -40,7 +40,7 @@ System Hardware Monitor'. The LM80 implements one temperature sensor, two FAN rotation speed sensors, seven voltage sensors, alarms, and some miscellaneous stuff. -Temperatures are measured in degrees Celcius. There are two sets of limits +Temperatures are measured in degrees Celsius. There are two sets of limits which operate independently. When the HOT Temperature Limit is crossed, this will cause an alarm that will be reasserted until the temperature drops below the HOT Hysteresis. The Overtemperature Shotdown (OS) limits diff --git a/doc/chips/lm83 b/doc/chips/lm83 index 944d0407..91331bf6 100644 --- a/doc/chips/lm83 +++ b/doc/chips/lm83 @@ -84,7 +84,7 @@ CPU. The two other sensors must be used to measure the temperature of two other points of the motherboard. We suspect these points to be the north and south bridges, but this couldn't be confirmed. -All temperature values are given in degrees Celcius. Local temperature +All temperature values are given in degrees Celsius. Local temperature is given within a range of 0 to +85 degrees. Remote temperatures are given within a range of 0 to +125 degrees. Resolution is 1.0 degree, accuracy is guaranteed to 3.0 degrees (see the datasheet for more diff --git a/doc/chips/lm87 b/doc/chips/lm87 index e5372071..09cb54c5 100644 --- a/doc/chips/lm87 +++ b/doc/chips/lm87 @@ -41,7 +41,7 @@ The LM87 implements up to three temperature sensors, up to two FAN rotation speed sensors, up to seven voltage sensors, alarms, and some miscellaneous stuff. -Temperatures are measured in degrees Celcius. Each input has a high +Temperatures are measured in degrees Celsius. Each input has a high and low alarm settings. A high limit produces an alarm when the value goes above it, and an alarm is also produced when the value goes below the low limit. diff --git a/doc/chips/lm90 b/doc/chips/lm90 index 6d12acda..155395eb 100644 --- a/doc/chips/lm90 +++ b/doc/chips/lm90 @@ -138,7 +138,7 @@ MAX6659 * Selectable address * Second critical temperature limit -All temperature values are given in degrees Celcius. Resolution +All temperature values are given in degrees Celsius. Resolution is 1.0 degree for the local temperature, 0.125 degree for the remote temperature. diff --git a/doc/chips/lm92 b/doc/chips/lm92 index e663b649..e20b4e4e 100644 --- a/doc/chips/lm92 +++ b/doc/chips/lm92 @@ -45,7 +45,7 @@ This driver implements support for the National Semiconductors LM92 temperature sensor. Each LM92 temperature sensor supports a single temperature sensor. -Temperatures are exported to proc in degrees celsius * 10000 (in other +Temperatures are exported to proc in degrees Celsius * 10000 (in other words temperatures are accurate to 4 decimal places). There are alarms for high, low, and critical thresholds. There's also an hysteresis to control the thresholds for resetting alarms. diff --git a/doc/chips/max1619 b/doc/chips/max1619 index 1336fe7c..a4ca4e29 100644 --- a/doc/chips/max1619 +++ b/doc/chips/max1619 @@ -39,7 +39,7 @@ Description The MAX1619 is a digital temperature sensor. It senses its own temperature as well as the temperature of up to one external diode. -All temperature values are given in degrees Celcius. Resolution +All temperature values are given in degrees Celsius. Resolution is 1.0 degree for the local temperature and for the remote temperature. Only the external sensor has high and low limits. diff --git a/doc/chips/pc87360 b/doc/chips/pc87360 index 8ae0f2f6..d40bfc9a 100644 --- a/doc/chips/pc87360 +++ b/doc/chips/pc87360 @@ -110,7 +110,7 @@ speed readings. No explanation nor fix could be found. Temperature Monitoring ---------------------- -Temperatures are reported in degrees Celcius. Each temperature measured has +Temperatures are reported in degrees Celsius. Each temperature measured has associated low, high and overtemperature limits, each of which triggers an alarm when crossed. diff --git a/doc/chips/sis5595 b/doc/chips/sis5595 index a9fe4411..ec4a33b7 100644 --- a/doc/chips/sis5595 +++ b/doc/chips/sis5595 @@ -64,7 +64,7 @@ set by the BIOS. If the temperature function is enabled, in4 will return 0. If the in4 function is enabled, temp will return 0. -Temperatures are measured in degrees Celcius. An alarm is triggered once +Temperatures are measured in degrees Celsius. An alarm is triggered once when the max is crossed; it is also triggered when it drops below the min value. Measurements are guaranteed diff --git a/doc/chips/thmc50 b/doc/chips/thmc50 index f3ec42d0..11dce298 100644 --- a/doc/chips/thmc50 +++ b/doc/chips/thmc50 @@ -46,7 +46,7 @@ register and Hysteresis register. Each value can be set and read to half-degree accuracy. An alarm is issued (usually to a connected LM78) when the temperature gets higher then the Overtemperature Shutdown value; it stays on until the temperature falls below the Hysteresis value. All temperatures are in -degrees Celcius, and are guaranteed within a range of -55 to +125 degrees. +degrees Celsius, and are guaranteed within a range of -55 to +125 degrees. The THMC50 only updates its values each 1.5 seconds; reading it more often will do no harm, but will return 'old' values. @@ -65,7 +65,7 @@ temp1 (internal) -- Three fields: [temp-os,rw] [temp-hyst,rw] [temp,ro] temp2 (remote) -- Three fields: [temp-os,rw] [temp-hyst,rw] [temp,ro] temp-os, temp-hyst, and temp are whole degree integers representing degrees -celcius. +Celsius. analog_out -- One field: [output-value,rw] diff --git a/doc/chips/via686a b/doc/chips/via686a index 4af233e8..528a8eca 100644 --- a/doc/chips/via686a +++ b/doc/chips/via686a @@ -39,10 +39,10 @@ For the I2C bus driver, see ../busses/i2c-viapro. The Via 686a implements three temperature sensors, two FAN rotation speed sensors, five voltage sensors and alarms. -Temperatures are measured in degrees Celcius. An alarm is triggered once +Temperatures are measured in degrees Celsius. An alarm is triggered once when the Overtemperature Shutdown limit is crossed; it is triggered again as soon as it drops below the hysteresis value. A more useful behaviour -can be found by setting the hysteresis value to +127 degrees Celcius; in +can be found by setting the hysteresis value to +127 degrees Celsius; in this case, alarms are issued during all the time when the actual temperature is above the Overtemperature Shutdown value. Measurements are guaranteed between -55 and +125 degrees, with a resolution of 1 degree. diff --git a/doc/chips/w83781d b/doc/chips/w83781d index 3ca3214f..14ccc717 100644 --- a/doc/chips/w83781d +++ b/doc/chips/w83781d @@ -107,12 +107,12 @@ two on the W83783S), three FAN rotation speed sensors, voltage sensors (seven on the W83781D, nine on the W83782D and six on the W83783S), VID lines, alarms with beep warnings, and some miscellaneous stuff. -Temperatures are measured in degrees Celcius. There is always one main +Temperatures are measured in degrees Celsius. There is always one main temperature sensor, and one (W83783S) or two (W83781D and W83782D) other sensors. An alarm is triggered for the main sensor once when the Overtemperature Shutdown limit is crossed; it is triggered again as soon as it drops below the Hysteresis value. A more useful behaviour -can be found by setting the Hysteresis value to +127 degrees Celcius; in +can be found by setting the Hysteresis value to +127 degrees Celsius; in this case, alarms are issued during all the time when the actual temperature is above the Overtemperature Shutdown value. The driver sets the hysteresis value for temp1 to 127 at initialization. diff --git a/doc/chips/w83792d b/doc/chips/w83792d index b19552e0..9e2309bc 100644 --- a/doc/chips/w83792d +++ b/doc/chips/w83792d @@ -34,7 +34,7 @@ The driver implements three temperature sensors, seven FAN rotation speed sensors, nine voltage sensors, and the Smart Fan I(Thermal Cruise mode) and Smart Fan II sensors. -Temperatures are measured in degrees Celcius. There is one main temperature +Temperatures are measured in degrees Celsius. There is one main temperature sensor, and two other sensors. A alarm is triggered when the measured temperture is higher than the Overtemperature or below the Hysteresis value. This is NOT correct, I misunderstand the Hysteresis value when I implement diff --git a/doc/chips/w83l785ts b/doc/chips/w83l785ts index c29d9ec2..1af17928 100644 --- a/doc/chips/w83l785ts +++ b/doc/chips/w83l785ts @@ -45,7 +45,7 @@ far suggest that the two possible limits are actually 95 and 110 degrees C. The datasheet is rather poor and obviously inaccurate on several points including this one. -All temperature values are given in degrees Celcius. Resolution +All temperature values are given in degrees Celsius. Resolution is 1.0 degree. See the datasheet for details. The w83l785ts driver will not update its values more frequently than diff --git a/doc/developers/design b/doc/developers/design index 9afb8075..045fb1a3 100644 --- a/doc/developers/design +++ b/doc/developers/design @@ -529,7 +529,7 @@ routines. As an example, I will here implement our old LM78 access function: -/* The SMBus locks itself, but ISA access must be locked explicitely! +/* The SMBus locks itself, but ISA access must be locked explicitly! We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks, would slow down the LM78 access and should not be necessary. There are some ugly typecasts here, but the good new is - they should diff --git a/doc/developers/proc b/doc/developers/proc index d9a6c399..9286febb 100644 --- a/doc/developers/proc +++ b/doc/developers/proc @@ -122,7 +122,7 @@ sensor[1-3] 1 Sensor type selection. temp, temp[1-4] 3 Temperature max, min or hysteresis, and input value. - Floating point values XXX.X or XXX.XX in degrees Celcius. + Floating point values XXX.X or XXX.XX in degrees Celsius. 'temp' is used if there is only one temperature sensor on the chip; for multiple temps. start with 'temp1'. Temp1 is generally the sensor inside the chip itself, diff --git a/doc/mkpatch b/doc/mkpatch index 22c88525..c5664e4d 100644 --- a/doc/mkpatch +++ b/doc/mkpatch @@ -63,7 +63,7 @@ mkpatch does several things: * For each file pair as specified in FILES, it creates a diff between them, but before that is done, it changes `#include' lines in the lm_sensors file as specified in INCLUDES - * It handles several special files, that have to be scanned explicitely + * It handles several special files, that have to be scanned explicitly to generate diffs to for them The generated diffs have specific headers. It will seem as if the old diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg index 11f2ad61..8182a6d9 100644 --- a/etc/sensors.conf.eg +++ b/etc/sensors.conf.eg @@ -1889,7 +1889,7 @@ chip "lm99-*" # note #1: only the LM99 needs this; for a LM89, comment the compute line # out -# note #2: there is no way for us to differenciate between a LM89 and a +# note #2: there is no way for us to differentiate between a LM89 and a # LM99; you have to know what you have; LM99 are frequently found on # graphics cards, most notably nVidia ones compute temp2 @+16, @-16 @@ -2265,7 +2265,7 @@ chip "pc87366-*" # 3435 is the thermistor beta. # This assumes that the thermistor forms a resistor divider with a resistor -# equal to its nominal value at 25 degres Celcius. If not, change the values. +# equal to its nominal value at 25 degres Celsius. If not, change the values. # We also assume that you have a working in10 (which is forcibly enabled by # default). If not, use 3.3 instead, but you lose accuracy. diff --git a/kernel/chips/adm1024.c b/kernel/chips/adm1024.c index dd87c13f..e93ca127 100644 --- a/kernel/chips/adm1024.c +++ b/kernel/chips/adm1024.c @@ -229,9 +229,9 @@ static struct i2c_driver adm1024_driver = { #define ADM1024_SYSCTL_IN5 1005 #define ADM1024_SYSCTL_FAN1 1101 /* Rotations/min */ #define ADM1024_SYSCTL_FAN2 1102 -#define ADM1024_SYSCTL_TEMP 1250 /* Degrees Celcius * 100 */ -#define ADM1024_SYSCTL_TEMP1 1290 /* Degrees Celcius */ -#define ADM1024_SYSCTL_TEMP2 1295 /* Degrees Celcius */ +#define ADM1024_SYSCTL_TEMP 1250 /* Degrees Celsius * 100 */ +#define ADM1024_SYSCTL_TEMP1 1290 /* Degrees Celsius */ +#define ADM1024_SYSCTL_TEMP2 1295 /* Degrees Celsius */ #define ADM1024_SYSCTL_FAN_DIV 2000 /* 1, 2, 4 or 8 */ #define ADM1024_SYSCTL_ALARMS 2001 /* bitvector */ #define ADM1024_SYSCTL_ANALOG_OUT 2002 diff --git a/kernel/chips/adm1025.c b/kernel/chips/adm1025.c index 33ca82b9..8a19bfba 100644 --- a/kernel/chips/adm1025.c +++ b/kernel/chips/adm1025.c @@ -174,7 +174,7 @@ static struct i2c_driver adm1025_driver = { #define ADM1025_SYSCTL_IN4 1004 #define ADM1025_SYSCTL_IN5 1005 -#define ADM1025_SYSCTL_RTEMP 1250 /* Degrees Celcius * 10 */ +#define ADM1025_SYSCTL_RTEMP 1250 /* Degrees Celsius * 10 */ #define ADM1025_SYSCTL_TEMP 1251 #define ADM1025_SYSCTL_ALARMS 2001 /* bitvector */ diff --git a/kernel/chips/adm9240.c b/kernel/chips/adm9240.c index 9019da6a..7b32c41d 100644 --- a/kernel/chips/adm9240.c +++ b/kernel/chips/adm9240.c @@ -228,7 +228,7 @@ static struct i2c_driver adm9240_driver = { #define ADM9240_SYSCTL_IN5 1005 #define ADM9240_SYSCTL_FAN1 1101 /* Rotations/min */ #define ADM9240_SYSCTL_FAN2 1102 -#define ADM9240_SYSCTL_TEMP 1250 /* Degrees Celcius * 100 */ +#define ADM9240_SYSCTL_TEMP 1250 /* Degrees Celsius * 100 */ #define ADM9240_SYSCTL_FAN_DIV 2000 /* 1, 2, 4 or 8 */ #define ADM9240_SYSCTL_ALARMS 2001 /* bitvector */ #define ADM9240_SYSCTL_ANALOG_OUT 2002 diff --git a/kernel/chips/asb100.c b/kernel/chips/asb100.c index af30f427..6364dfeb 100644 --- a/kernel/chips/asb100.c +++ b/kernel/chips/asb100.c @@ -266,7 +266,7 @@ static struct i2c_driver asb100_driver = { #define ASB100_SYSCTL_FAN2 1102 #define ASB100_SYSCTL_FAN3 1103 -#define ASB100_SYSCTL_TEMP1 1200 /* Degrees Celcius * 10 */ +#define ASB100_SYSCTL_TEMP1 1200 /* Degrees Celsius * 10 */ #define ASB100_SYSCTL_TEMP2 1201 #define ASB100_SYSCTL_TEMP3 1202 #define ASB100_SYSCTL_TEMP4 1203 diff --git a/kernel/chips/ds1621.c b/kernel/chips/ds1621.c index dd713b5a..d67b4cca 100644 --- a/kernel/chips/ds1621.c +++ b/kernel/chips/ds1621.c @@ -124,7 +124,7 @@ static struct i2c_driver ds1621_driver = { }; /* -- SENSORS SYSCTL START -- */ -#define DS1621_SYSCTL_TEMP 1200 /* Degrees Celcius * 10 */ +#define DS1621_SYSCTL_TEMP 1200 /* Degrees Celsius * 10 */ #define DS1621_SYSCTL_ALARMS 2001 /* bitvector */ #define DS1621_ALARM_TEMP_HIGH 0x40 #define DS1621_ALARM_TEMP_LOW 0x20 diff --git a/kernel/chips/gl518sm.c b/kernel/chips/gl518sm.c index 5c01db07..bf6417fb 100644 --- a/kernel/chips/gl518sm.c +++ b/kernel/chips/gl518sm.c @@ -189,7 +189,7 @@ static struct i2c_driver gl518_driver = { #define GL518_SYSCTL_VIN3 1003 #define GL518_SYSCTL_FAN1 1101 /* RPM */ #define GL518_SYSCTL_FAN2 1102 -#define GL518_SYSCTL_TEMP 1200 /* Degrees Celcius * 10 */ +#define GL518_SYSCTL_TEMP 1200 /* Degrees Celsius * 10 */ #define GL518_SYSCTL_FAN_DIV 2000 /* 1, 2, 4 or 8 */ #define GL518_SYSCTL_ALARMS 2001 /* bitvector */ #define GL518_SYSCTL_BEEP 2002 /* bitvector */ diff --git a/kernel/chips/gl520sm.c b/kernel/chips/gl520sm.c index 1130cba4..39e703c3 100644 --- a/kernel/chips/gl520sm.c +++ b/kernel/chips/gl520sm.c @@ -185,8 +185,8 @@ static struct i2c_driver gl520_driver = { #define GL520_SYSCTL_VIN4 1004 #define GL520_SYSCTL_FAN1 1101 /* RPM */ #define GL520_SYSCTL_FAN2 1102 -#define GL520_SYSCTL_TEMP1 1200 /* Degrees Celcius * 10 */ -#define GL520_SYSCTL_TEMP2 1201 /* Degrees Celcius * 10 */ +#define GL520_SYSCTL_TEMP1 1200 /* Degrees Celsius * 10 */ +#define GL520_SYSCTL_TEMP2 1201 /* Degrees Celsius * 10 */ #define GL520_SYSCTL_VID 1300 #define GL520_SYSCTL_FAN_DIV 2000 /* 1, 2, 4 or 8 */ #define GL520_SYSCTL_ALARMS 2001 /* bitvector */ diff --git a/kernel/chips/it87.c b/kernel/chips/it87.c index 33ceee4f..0e096380 100644 --- a/kernel/chips/it87.c +++ b/kernel/chips/it87.c @@ -308,9 +308,9 @@ static struct i2c_driver it87_driver = { #define IT87_SYSCTL_FAN1 1101 /* Rotations/min */ #define IT87_SYSCTL_FAN2 1102 #define IT87_SYSCTL_FAN3 1103 -#define IT87_SYSCTL_TEMP1 1200 /* Degrees Celcius * 10 */ -#define IT87_SYSCTL_TEMP2 1201 /* Degrees Celcius * 10 */ -#define IT87_SYSCTL_TEMP3 1202 /* Degrees Celcius * 10 */ +#define IT87_SYSCTL_TEMP1 1200 /* Degrees Celsius * 10 */ +#define IT87_SYSCTL_TEMP2 1201 /* Degrees Celsius * 10 */ +#define IT87_SYSCTL_TEMP3 1202 /* Degrees Celsius * 10 */ #define IT87_SYSCTL_VID 1300 /* Volts * 100 */ #define IT87_SYSCTL_FAN_DIV 2000 /* 1, 2, 4 or 8 */ #define IT87_SYSCTL_ALARMS 2004 /* bitvector */ diff --git a/kernel/chips/lm75.c b/kernel/chips/lm75.c index a4949b19..5b7f6ef3 100644 --- a/kernel/chips/lm75.c +++ b/kernel/chips/lm75.c @@ -79,7 +79,7 @@ static struct i2c_driver lm75_driver = { /* -- SENSORS SYSCTL START -- */ -#define LM75_SYSCTL_TEMP 1200 /* Degrees Celcius * 10 */ +#define LM75_SYSCTL_TEMP 1200 /* Degrees Celsius * 10 */ /* -- SENSORS SYSCTL END -- */ diff --git a/kernel/chips/lm78.c b/kernel/chips/lm78.c index 82f8ef91..11e04d4a 100644 --- a/kernel/chips/lm78.c +++ b/kernel/chips/lm78.c @@ -185,7 +185,7 @@ static struct i2c_driver lm78_driver = { #define LM78_SYSCTL_FAN1 1101 /* Rotations/min */ #define LM78_SYSCTL_FAN2 1102 #define LM78_SYSCTL_FAN3 1103 -#define LM78_SYSCTL_TEMP 1200 /* Degrees Celcius * 10 */ +#define LM78_SYSCTL_TEMP 1200 /* Degrees Celsius * 10 */ #define LM78_SYSCTL_VID 1300 /* Volts * 100 */ #define LM78_SYSCTL_FAN_DIV 2000 /* 1, 2, 4 or 8 */ #define LM78_SYSCTL_ALARMS 2001 /* bitvector */ diff --git a/kernel/chips/lm80.c b/kernel/chips/lm80.c index c7bc1487..fbfae660 100644 --- a/kernel/chips/lm80.c +++ b/kernel/chips/lm80.c @@ -173,7 +173,7 @@ static struct i2c_driver lm80_driver = { #define LM80_SYSCTL_IN6 1006 #define LM80_SYSCTL_FAN1 1101 /* Rotations/min */ #define LM80_SYSCTL_FAN2 1102 -#define LM80_SYSCTL_TEMP 1250 /* Degrees Celcius * 100 */ +#define LM80_SYSCTL_TEMP 1250 /* Degrees Celsius * 100 */ #define LM80_SYSCTL_FAN_DIV 2000 /* 1, 2, 4 or 8 */ #define LM80_SYSCTL_ALARMS 2001 /* bitvector */ diff --git a/kernel/chips/lm87.c b/kernel/chips/lm87.c index 49597ffb..f325478a 100644 --- a/kernel/chips/lm87.c +++ b/kernel/chips/lm87.c @@ -269,9 +269,9 @@ static struct i2c_driver LM87_driver = { #define LM87_SYSCTL_AIN2 1007 #define LM87_SYSCTL_FAN1 1102 #define LM87_SYSCTL_FAN2 1103 -#define LM87_SYSCTL_TEMP1 1250 /* Degrees Celcius * 10 */ -#define LM87_SYSCTL_TEMP2 1251 /* Degrees Celcius * 10 */ -#define LM87_SYSCTL_TEMP3 1252 /* Degrees Celcius * 10 */ +#define LM87_SYSCTL_TEMP1 1250 /* Degrees Celsius * 10 */ +#define LM87_SYSCTL_TEMP2 1251 /* Degrees Celsius * 10 */ +#define LM87_SYSCTL_TEMP3 1252 /* Degrees Celsius * 10 */ #define LM87_SYSCTL_FAN_DIV 2000 /* 1, 2, 4 or 8 */ #define LM87_SYSCTL_ALARMS 2001 /* bitvector */ #define LM87_SYSCTL_ANALOG_OUT 2002 diff --git a/kernel/chips/lm93.c b/kernel/chips/lm93.c index 93ab6dd4..a6d34f7b 100644 --- a/kernel/chips/lm93.c +++ b/kernel/chips/lm93.c @@ -95,7 +95,7 @@ MODULE_PARM_DESC(vid_agtl, "Configures VID pin input thresholds"); #define LM93_SYSCTL_IN15 1015 #define LM93_SYSCTL_IN16 1016 -/* degrees celcius * 10 */ +/* degrees Celsius * 10 */ #define LM93_SYSCTL_TEMP1 1101 #define LM93_SYSCTL_TEMP2 1102 #define LM93_SYSCTL_TEMP3 1103 @@ -121,7 +121,7 @@ MODULE_PARM_DESC(vid_agtl, "Configures VID pin input thresholds"); #define LM93_SYSCTL_TEMP2_AUTO_PWM_MIN 1152 #define LM93_SYSCTL_TEMP3_AUTO_PWM_MIN 1153 -/* degrees celcius * 10 */ +/* degrees Celsius * 10 */ #define LM93_SYSCTL_TEMP1_AUTO_OFFSET_HYST 1161 #define LM93_SYSCTL_TEMP2_AUTO_OFFSET_HYST 1162 #define LM93_SYSCTL_TEMP3_AUTO_OFFSET_HYST 1163 diff --git a/kernel/chips/maxilife.c b/kernel/chips/maxilife.c index 3475690f..6bb55e24 100644 --- a/kernel/chips/maxilife.c +++ b/kernel/chips/maxilife.c @@ -323,12 +323,12 @@ static int maxi_version = cristal; #define MAXI_SYSCTL_FAN2 1102 /* Rotations/min */ #define MAXI_SYSCTL_FAN3 1103 /* Rotations/min */ #define MAXI_SYSCTL_FAN4 1104 /* Rotations/min */ -#define MAXI_SYSCTL_TEMP1 1201 /* Degrees Celcius */ -#define MAXI_SYSCTL_TEMP2 1202 /* Degrees Celcius */ -#define MAXI_SYSCTL_TEMP3 1203 /* Degrees Celcius */ -#define MAXI_SYSCTL_TEMP4 1204 /* Degrees Celcius */ -#define MAXI_SYSCTL_TEMP5 1205 /* Degrees Celcius */ -#define MAXI_SYSCTL_TEMP6 1206 /* Degrees Celcius */ +#define MAXI_SYSCTL_TEMP1 1201 /* Degrees Celsius */ +#define MAXI_SYSCTL_TEMP2 1202 /* Degrees Celsius */ +#define MAXI_SYSCTL_TEMP3 1203 /* Degrees Celsius */ +#define MAXI_SYSCTL_TEMP4 1204 /* Degrees Celsius */ +#define MAXI_SYSCTL_TEMP5 1205 /* Degrees Celsius */ +#define MAXI_SYSCTL_TEMP6 1206 /* Degrees Celsius */ #define MAXI_SYSCTL_PLL 1301 /* MHz */ #define MAXI_SYSCTL_VID1 1401 /* Volts / 6.337, for nba just Volts */ #define MAXI_SYSCTL_VID2 1402 /* Volts */ diff --git a/kernel/chips/mtp008.c b/kernel/chips/mtp008.c index 7008146f..3b8f4c5b 100644 --- a/kernel/chips/mtp008.c +++ b/kernel/chips/mtp008.c @@ -272,9 +272,9 @@ static struct i2c_driver mtp008_driver = #define MTP008_SYSCTL_FAN1 1101 /* Rotations/min */ #define MTP008_SYSCTL_FAN2 1102 #define MTP008_SYSCTL_FAN3 1103 -#define MTP008_SYSCTL_TEMP1 1200 /* Degrees Celcius * 10 */ -#define MTP008_SYSCTL_TEMP2 1201 /* Degrees Celcius * 10 */ -#define MTP008_SYSCTL_TEMP3 1202 /* Degrees Celcius * 10 */ +#define MTP008_SYSCTL_TEMP1 1200 /* Degrees Celsius * 10 */ +#define MTP008_SYSCTL_TEMP2 1201 /* Degrees Celsius * 10 */ +#define MTP008_SYSCTL_TEMP3 1202 /* Degrees Celsius * 10 */ #define MTP008_SYSCTL_VID 1300 /* Volts * 100 */ #define MTP008_SYSCTL_PWM1 1401 #define MTP008_SYSCTL_PWM2 1402 diff --git a/kernel/chips/pc87360.c b/kernel/chips/pc87360.c index 7e3d3f5a..080a2e51 100644 --- a/kernel/chips/pc87360.c +++ b/kernel/chips/pc87360.c @@ -327,7 +327,7 @@ static struct i2c_driver pc87360_driver = { #define PC87365_STATUS_IN_MIN 0x02 #define PC87365_STATUS_IN_MAX 0x04 -#define PC87365_SYSCTL_TEMP1 3101 /* degrees Celcius */ +#define PC87365_SYSCTL_TEMP1 3101 /* degrees Celsius */ #define PC87365_SYSCTL_TEMP2 3102 #define PC87365_SYSCTL_TEMP3 3103 /* not for PC87365 */ #define PC87365_SYSCTL_TEMP1_STATUS 3301 /* bit field */ diff --git a/kernel/chips/sis5595.c b/kernel/chips/sis5595.c index 9230e8e1..2dce73cb 100644 --- a/kernel/chips/sis5595.c +++ b/kernel/chips/sis5595.c @@ -234,7 +234,7 @@ static struct i2c_driver sis5595_driver = { #define SIS5595_SYSCTL_IN4 1004 #define SIS5595_SYSCTL_FAN1 1101 /* Rotations/min */ #define SIS5595_SYSCTL_FAN2 1102 -#define SIS5595_SYSCTL_TEMP 1200 /* Degrees Celcius * 10 */ +#define SIS5595_SYSCTL_TEMP 1200 /* Degrees Celsius * 10 */ #define SIS5595_SYSCTL_FAN_DIV 2000 /* 1, 2, 4 or 8 */ #define SIS5595_SYSCTL_ALARMS 2001 /* bitvector */ diff --git a/kernel/chips/thmc50.c b/kernel/chips/thmc50.c index 2c7adfad..a0c50e7f 100644 --- a/kernel/chips/thmc50.c +++ b/kernel/chips/thmc50.c @@ -121,8 +121,8 @@ static struct i2c_driver thmc50_driver = { /* -- SENSORS SYSCTL START -- */ -#define THMC50_SYSCTL_TEMP 1200 /* Degrees Celcius */ -#define THMC50_SYSCTL_REMOTE_TEMP 1201 /* Degrees Celcius */ +#define THMC50_SYSCTL_TEMP 1200 /* Degrees Celsius */ +#define THMC50_SYSCTL_REMOTE_TEMP 1201 /* Degrees Celsius */ #define THMC50_SYSCTL_INTER 1202 #define THMC50_SYSCTL_INTER_MASK 1203 #define THMC50_SYSCTL_DIE_CODE 1204 diff --git a/kernel/chips/w83627hf.c b/kernel/chips/w83627hf.c index 84cbb7a5..3235a114 100644 --- a/kernel/chips/w83627hf.c +++ b/kernel/chips/w83627hf.c @@ -383,9 +383,9 @@ static struct i2c_driver w83627hf_driver = { #define W83781D_SYSCTL_FAN1 1101 /* Rotations/min */ #define W83781D_SYSCTL_FAN2 1102 #define W83781D_SYSCTL_FAN3 1103 -#define W83781D_SYSCTL_TEMP1 1200 /* Degrees Celcius * 10 */ -#define W83781D_SYSCTL_TEMP2 1201 /* Degrees Celcius * 10 */ -#define W83781D_SYSCTL_TEMP3 1202 /* Degrees Celcius * 10 */ +#define W83781D_SYSCTL_TEMP1 1200 /* Degrees Celsius * 10 */ +#define W83781D_SYSCTL_TEMP2 1201 /* Degrees Celsius * 10 */ +#define W83781D_SYSCTL_TEMP3 1202 /* Degrees Celsius * 10 */ #define W83781D_SYSCTL_VID 1300 /* Volts * 1000 */ #define W83781D_SYSCTL_VRM 1301 #define W83781D_SYSCTL_PWM1 1401 diff --git a/kernel/chips/w83781d.c b/kernel/chips/w83781d.c index 6d871687..b7baaa59 100644 --- a/kernel/chips/w83781d.c +++ b/kernel/chips/w83781d.c @@ -352,9 +352,9 @@ static struct i2c_driver w83781d_driver = { #define W83781D_SYSCTL_FAN4 1104 #define W83781D_SYSCTL_FAN5 1105 -#define W83781D_SYSCTL_TEMP1 1200 /* Degrees Celcius * 10 */ -#define W83781D_SYSCTL_TEMP2 1201 /* Degrees Celcius * 10 */ -#define W83781D_SYSCTL_TEMP3 1202 /* Degrees Celcius * 10 */ +#define W83781D_SYSCTL_TEMP1 1200 /* Degrees Celsius * 10 */ +#define W83781D_SYSCTL_TEMP2 1201 /* Degrees Celsius * 10 */ +#define W83781D_SYSCTL_TEMP3 1202 /* Degrees Celsius * 10 */ #define W83781D_SYSCTL_VID 1300 /* Volts * 1000 */ #define W83781D_SYSCTL_VRM 1301 #define W83781D_SYSCTL_PWM1 1401 diff --git a/lib/sensors.conf.5 b/lib/sensors.conf.5 index acb5863e..3d3ec4fd 100644 --- a/lib/sensors.conf.5 +++ b/lib/sensors.conf.5 @@ -356,7 +356,7 @@ or statement for the class name feature forces the same settings for all other class members. A specific statement for a class member feature always overrides the general class setting, though. This means that you can't -override the class name feature explicitely. +override the class name feature explicitly. A simple example will explain this better. The .I fan1 |