mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
hwmon: (i5k_amb) Convert macros to C functions
hwmon: (w83781d) Add missing curly braces
hwmon: (abituguru3) Identify ABit IP35 Pro as such
hwmon: (f75375s) pwmX_mode sysfs files writable for f75375 variant
hwmon: (f75375s) On n2100 systems, set fans to full speed on boot
hwmon: (f75375s) Allow setting up fans with platform_data
hwmon: (f75375s) Add new style bindings
hwmon: (lm70) Convert semaphore to mutex
hwmon: (applesmc) Add support for Mac Pro 2 x Quad-Core
hwmon: (abituguru3) Add support for 2 new motherboards
hwmon: (ibmpex) Change printk to dev_{info,err} macros
hwmon: (i5k_amb) New memory temperature sensor driver
hwmon: (f75375s) fix pwm mode setting
hwmon: (ibmpex.c) fix NULL dereference
hwmon: (sis5595) Split sis5595_attributes_opt
hwmon: (sis5595) Add individual alarm files
hwmon: (w83627hf) push nr+1 offset into *_REG_FAN macros and simplify
hwmon: (w83627hf) hoist nr-1 offset out of show-store-temp-X
hwmon: Add power meter spec to Documentation/hwmon/sysfs-interface
This commit is contained in:
commit
9418d5dc9b
15 changed files with 1049 additions and 189 deletions
|
|
@ -328,6 +328,37 @@ curr[1-*]_input Current input value
|
|||
Unit: milliampere
|
||||
RO
|
||||
|
||||
*********
|
||||
* Power *
|
||||
*********
|
||||
|
||||
power[1-*]_average Average power use
|
||||
Unit: microWatt
|
||||
RO
|
||||
|
||||
power[1-*]_average_highest Historical average maximum power use
|
||||
Unit: microWatt
|
||||
RO
|
||||
|
||||
power[1-*]_average_lowest Historical average minimum power use
|
||||
Unit: microWatt
|
||||
RO
|
||||
|
||||
power[1-*]_input Instantaneous power use
|
||||
Unit: microWatt
|
||||
RO
|
||||
|
||||
power[1-*]_input_highest Historical maximum power use
|
||||
Unit: microWatt
|
||||
RO
|
||||
|
||||
power[1-*]_input_lowest Historical minimum power use
|
||||
Unit: microWatt
|
||||
RO
|
||||
|
||||
power[1-*]_reset_history Reset input_highest, input_lowest,
|
||||
average_highest and average_lowest.
|
||||
WO
|
||||
|
||||
**********
|
||||
* Alarms *
|
||||
|
|
|
|||
Loading…
Reference in a new issue