X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=Documentation%2Fhwmon%2Fsysfs-interface;h=6dbfd5efd991de9f6a69eaa831d1a45634ba5979;hb=ddedc658fc56bb5b9b200d7f4df6e93e1d0d8048;hp=2d845730d4e0e81c65ff5ceb5299a79724daf62f;hpb=98dd22c3e086d76058083432d4d8fb85f04bab90;p=linux-2.6-omap-h63xx.git

diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index 2d845730d4e..6dbfd5efd99 100644
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -329,6 +329,10 @@ power[1-*]_average		Average power use
 				Unit: microWatt
 				RO
 
+power[1-*]_average_interval	Power use averaging interval
+				Unit: milliseconds
+				RW
+
 power[1-*]_average_highest	Historical average maximum power use
 				Unit: microWatt
 				RO
@@ -353,6 +357,14 @@ power[1-*]_reset_history	Reset input_highest, input_lowest,
 				average_highest and average_lowest.
 				WO
 
+**********
+* Energy *
+**********
+
+energy[1-*]_input		Cumulative energy use
+				Unit: microJoule
+				RO
+
 **********
 * Alarms *
 **********