diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-08 14:27:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-08 14:27:13 -0400 |
| commit | 7698fdedcfa3cab3dd40c9b685590b23be02e267 (patch) | |
| tree | 207ddae0f963174356b1a9de7fff8e48a9c1e9c1 /Documentation/hwmon/sysfs-interface | |
| parent | 2d8d24935d372175786ebefa8a2de8680831b67f (diff) | |
| parent | ae5c8c83735f5fcb09b380944e4854a383006998 (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
Diffstat (limited to 'Documentation/hwmon/sysfs-interface')
| -rw-r--r-- | Documentation/hwmon/sysfs-interface | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface index 2f10ce6a879f..004ee161721e 100644 --- a/Documentation/hwmon/sysfs-interface +++ b/Documentation/hwmon/sysfs-interface | |||
| @@ -150,6 +150,11 @@ fan[1-*]_min Fan minimum value | |||
| 150 | Unit: revolution/min (RPM) | 150 | Unit: revolution/min (RPM) |
| 151 | RW | 151 | RW |
| 152 | 152 | ||
| 153 | fan[1-*]_max Fan maximum value | ||
| 154 | Unit: revolution/min (RPM) | ||
| 155 | Only rarely supported by the hardware. | ||
| 156 | RW | ||
| 157 | |||
| 153 | fan[1-*]_input Fan input value. | 158 | fan[1-*]_input Fan input value. |
| 154 | Unit: revolution/min (RPM) | 159 | Unit: revolution/min (RPM) |
| 155 | RO | 160 | RO |
| @@ -390,6 +395,7 @@ OR | |||
| 390 | in[0-*]_min_alarm | 395 | in[0-*]_min_alarm |
| 391 | in[0-*]_max_alarm | 396 | in[0-*]_max_alarm |
| 392 | fan[1-*]_min_alarm | 397 | fan[1-*]_min_alarm |
| 398 | fan[1-*]_max_alarm | ||
| 393 | temp[1-*]_min_alarm | 399 | temp[1-*]_min_alarm |
| 394 | temp[1-*]_max_alarm | 400 | temp[1-*]_max_alarm |
| 395 | temp[1-*]_crit_alarm | 401 | temp[1-*]_crit_alarm |