diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 15:07:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 15:07:28 -0400 |
commit | 36f021b579d195cdc5fa6f3e2bab198b4bf70643 (patch) | |
tree | 96d3c97f5e5214d2aa7151c12a22a7eb345dbaa1 /Documentation | |
parent | 215d06780d13fd7de629b02b61b7b7bf88ce5039 (diff) | |
parent | 1d72acf91abb327e25137ad2e371c1a788b34e45 (diff) |
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (32 commits)
Use menuconfig objects - hwmon
hwmon/smsc47b397: Use dynamic sysfs callbacks
hwmon/smsc47b397: Convert to a platform driver
hwmon/w83781d: Deprecate W83627HF support
hwmon/w83781d: Use dynamic sysfs callbacks
hwmon/w83781d: Be less i2c_client-centric
hwmon/w83781d: Clean up conversion macros
hwmon/w83781d: No longer use i2c-isa
hwmon/ams: Do not print error on systems without apple motion sensor
hwmon/ams: Fix I2C read retry logic
hwmon: New AD7416, AD7417 and AD7418 driver
hwmon/coretemp: Add documentation
hwmon: New coretemp driver
i386: Use functions from library in msr driver
i386: Add safe variants of rdmsr_on_cpu and wrmsr_on_cpu
hwmon/lm75: Use dynamic sysfs callbacks
hwmon/lm78: Use dynamic sysfs callbacks
hwmon/lm78: Be less i2c_client-centric
hwmon/lm78: No longer use i2c-isa
hwmon: New max6650 driver
...
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/hwmon/coretemp | 36 | ||||
-rw-r--r-- | Documentation/hwmon/max6650 | 53 | ||||
-rw-r--r-- | Documentation/hwmon/smsc47m1 | 11 | ||||
-rw-r--r-- | Documentation/hwmon/smsc47m192 | 7 | ||||
-rw-r--r-- | Documentation/hwmon/sysfs-interface | 7 |
5 files changed, 108 insertions, 6 deletions
diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp new file mode 100644 index 000000000000..870cda9416e9 --- /dev/null +++ b/Documentation/hwmon/coretemp | |||
@@ -0,0 +1,36 @@ | |||
1 | Kernel driver coretemp | ||
2 | ====================== | ||
3 | |||
4 | Supported chips: | ||
5 | * All Intel Core family | ||
6 | Prefix: 'coretemp' | ||
7 | CPUID: family 0x6, models 0xe, 0xf | ||
8 | Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual | ||
9 | Volume 3A: System Programming Guide | ||
10 | |||
11 | Author: Rudolf Marek | ||
12 | |||
13 | Description | ||
14 | ----------- | ||
15 | |||
16 | This driver permits reading temperature sensor embedded inside Intel Core CPU. | ||
17 | Temperature is measured in degrees Celsius and measurement resolution is | ||
18 | 1 degree C. Valid temperatures are from 0 to TjMax degrees C, because | ||
19 | the actual value of temperature register is in fact a delta from TjMax. | ||
20 | |||
21 | Temperature known as TjMax is the maximum junction temperature of processor. | ||
22 | Intel defines this temperature as 85C or 100C. At this temperature, protection | ||
23 | mechanism will perform actions to forcibly cool down the processor. Alarm | ||
24 | may be raised, if the temperature grows enough (more than TjMax) to trigger | ||
25 | the Out-Of-Spec bit. Following table summarizes the exported sysfs files: | ||
26 | |||
27 | temp1_input - Core temperature (in millidegrees Celsius). | ||
28 | temp1_crit - Maximum junction temperature (in millidegrees Celsius). | ||
29 | temp1_crit_alarm - Set when Out-of-spec bit is set, never clears. | ||
30 | Correct CPU operation is no longer guaranteed. | ||
31 | temp1_label - Contains string "Core X", where X is processor | ||
32 | number. | ||
33 | |||
34 | The TjMax temperature is set to 85 degrees C if undocumented model specific | ||
35 | register (UMSR) 0xee has bit 30 set. If not the TjMax is 100 degrees C as | ||
36 | (sometimes) documented in processor datasheet. | ||
diff --git a/Documentation/hwmon/max6650 b/Documentation/hwmon/max6650 new file mode 100644 index 000000000000..8be7beb9e3e8 --- /dev/null +++ b/Documentation/hwmon/max6650 | |||
@@ -0,0 +1,53 @@ | |||
1 | Kernel driver max6650 | ||
2 | ===================== | ||
3 | |||
4 | Supported chips: | ||
5 | * Maxim 6650 / 6651 | ||
6 | Prefix: 'max6650' | ||
7 | Addresses scanned: I2C 0x1b, 0x1f, 0x48, 0x4b | ||
8 | Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6650-MAX6651.pdf | ||
9 | |||
10 | Authors: | ||
11 | Hans J. Koch <hjk@linutronix.de> | ||
12 | John Morris <john.morris@spirentcom.com> | ||
13 | Claus Gindhart <claus.gindhart@kontron.com> | ||
14 | |||
15 | Description | ||
16 | ----------- | ||
17 | |||
18 | This driver implements support for the Maxim 6650/6651 | ||
19 | |||
20 | The 2 devices are very similar, but the Maxim 6550 has a reduced feature | ||
21 | set, e.g. only one fan-input, instead of 4 for the 6651. | ||
22 | |||
23 | The driver is not able to distinguish between the 2 devices. | ||
24 | |||
25 | The driver provides the following sensor accesses in sysfs: | ||
26 | |||
27 | fan1_input ro fan tachometer speed in RPM | ||
28 | fan2_input ro " | ||
29 | fan3_input ro " | ||
30 | fan4_input ro " | ||
31 | fan1_target rw desired fan speed in RPM (closed loop mode only) | ||
32 | pwm1_enable rw regulator mode, 0=full on, 1=open loop, 2=closed loop | ||
33 | pwm1 rw relative speed (0-255), 255=max. speed. | ||
34 | Used in open loop mode only. | ||
35 | fan1_div rw sets the speed range the inputs can handle. Legal | ||
36 | values are 1, 2, 4, and 8. Use lower values for | ||
37 | faster fans. | ||
38 | |||
39 | Module parameters | ||
40 | ----------------- | ||
41 | |||
42 | If your board has a BIOS that initializes the MAX6650/6651 correctly, you can | ||
43 | simply load your module without parameters. It won't touch the configuration | ||
44 | registers then. If your board BIOS doesn't initialize the chip, or you want | ||
45 | different settings, you can set the following parameters: | ||
46 | |||
47 | voltage_12V: 5=5V fan, 12=12V fan, 0=don't change | ||
48 | prescaler: Possible values are 1,2,4,8,16, or 0 for don't change | ||
49 | clock: The clock frequency in Hz of the chip the driver should assume [254000] | ||
50 | |||
51 | Please have a look at the MAX6650/6651 data sheet and make sure that you fully | ||
52 | understand the meaning of these parameters before you attempt to change them. | ||
53 | |||
diff --git a/Documentation/hwmon/smsc47m1 b/Documentation/hwmon/smsc47m1 index 04a11124f667..42c8431b3c9d 100644 --- a/Documentation/hwmon/smsc47m1 +++ b/Documentation/hwmon/smsc47m1 | |||
@@ -14,6 +14,10 @@ Supported chips: | |||
14 | http://www.smsc.com/main/datasheets/47m14x.pdf | 14 | http://www.smsc.com/main/datasheets/47m14x.pdf |
15 | http://www.smsc.com/main/tools/discontinued/47m15x.pdf | 15 | http://www.smsc.com/main/tools/discontinued/47m15x.pdf |
16 | http://www.smsc.com/main/datasheets/47m192.pdf | 16 | http://www.smsc.com/main/datasheets/47m192.pdf |
17 | * SMSC LPC47M292 | ||
18 | Addresses scanned: none, address read from Super I/O config space | ||
19 | Prefix: 'smsc47m2' | ||
20 | Datasheet: Not public | ||
17 | * SMSC LPC47M997 | 21 | * SMSC LPC47M997 |
18 | Addresses scanned: none, address read from Super I/O config space | 22 | Addresses scanned: none, address read from Super I/O config space |
19 | Prefix: 'smsc47m1' | 23 | Prefix: 'smsc47m1' |
@@ -32,9 +36,10 @@ Description | |||
32 | The Standard Microsystems Corporation (SMSC) 47M1xx Super I/O chips | 36 | The Standard Microsystems Corporation (SMSC) 47M1xx Super I/O chips |
33 | contain monitoring and PWM control circuitry for two fans. | 37 | contain monitoring and PWM control circuitry for two fans. |
34 | 38 | ||
35 | The 47M15x and 47M192 chips contain a full 'hardware monitoring block' | 39 | The LPC47M15x, LPC47M192 and LPC47M292 chips contain a full 'hardware |
36 | in addition to the fan monitoring and control. The hardware monitoring | 40 | monitoring block' in addition to the fan monitoring and control. The |
37 | block is not supported by the driver. | 41 | hardware monitoring block is not supported by this driver, use the |
42 | smsc47m192 driver for that. | ||
38 | 43 | ||
39 | No documentation is available for the 47M997, but it has the same device | 44 | No documentation is available for the 47M997, but it has the same device |
40 | ID as the 47M15x and 47M192 chips and seems to be compatible. | 45 | ID as the 47M15x and 47M192 chips and seems to be compatible. |
diff --git a/Documentation/hwmon/smsc47m192 b/Documentation/hwmon/smsc47m192 index 45d6453cd435..6d54ecb7b3f8 100644 --- a/Documentation/hwmon/smsc47m192 +++ b/Documentation/hwmon/smsc47m192 | |||
@@ -2,12 +2,13 @@ Kernel driver smsc47m192 | |||
2 | ======================== | 2 | ======================== |
3 | 3 | ||
4 | Supported chips: | 4 | Supported chips: |
5 | * SMSC LPC47M192 and LPC47M997 | 5 | * SMSC LPC47M192, LPC47M15x, LPC47M292 and LPC47M997 |
6 | Prefix: 'smsc47m192' | 6 | Prefix: 'smsc47m192' |
7 | Addresses scanned: I2C 0x2c - 0x2d | 7 | Addresses scanned: I2C 0x2c - 0x2d |
8 | Datasheet: The datasheet for LPC47M192 is publicly available from | 8 | Datasheet: The datasheet for LPC47M192 is publicly available from |
9 | http://www.smsc.com/ | 9 | http://www.smsc.com/ |
10 | The LPC47M997 is compatible for hardware monitoring. | 10 | The LPC47M15x, LPC47M292 and LPC47M997 are compatible for |
11 | hardware monitoring. | ||
11 | 12 | ||
12 | Author: Hartmut Rick <linux@rick.claranet.de> | 13 | Author: Hartmut Rick <linux@rick.claranet.de> |
13 | Special thanks to Jean Delvare for careful checking | 14 | Special thanks to Jean Delvare for careful checking |
@@ -18,7 +19,7 @@ Description | |||
18 | ----------- | 19 | ----------- |
19 | 20 | ||
20 | This driver implements support for the hardware sensor capabilities | 21 | This driver implements support for the hardware sensor capabilities |
21 | of the SMSC LPC47M192 and LPC47M997 Super-I/O chips. | 22 | of the SMSC LPC47M192 and compatible Super-I/O chips. |
22 | 23 | ||
23 | These chips support 3 temperature channels and 8 voltage inputs | 24 | These chips support 3 temperature channels and 8 voltage inputs |
24 | as well as CPU voltage VID input. | 25 | as well as CPU voltage VID input. |
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface index d73d2e8c7534..a9a18ad0d17a 100644 --- a/Documentation/hwmon/sysfs-interface +++ b/Documentation/hwmon/sysfs-interface | |||
@@ -152,6 +152,13 @@ fan[1-*]_div Fan divisor. | |||
152 | Note that this is actually an internal clock divisor, which | 152 | Note that this is actually an internal clock divisor, which |
153 | affects the measurable speed range, not the read value. | 153 | affects the measurable speed range, not the read value. |
154 | 154 | ||
155 | fan[1-*]_target | ||
156 | Desired fan speed | ||
157 | Unit: revolution/min (RPM) | ||
158 | RW | ||
159 | Only makes sense if the chip supports closed-loop fan speed | ||
160 | control based on the measured fan speed. | ||
161 | |||
155 | Also see the Alarms section for status flags associated with fans. | 162 | Also see the Alarms section for status flags associated with fans. |
156 | 163 | ||
157 | 164 | ||