From ed9c69c7b659d9fb4f4eb9d36eea9f7daaa81c38 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Thu, 9 Oct 2008 15:33:58 +0200 Subject: [PATCH] --- yaml --- r: 110245 b: refs/heads/master c: ddedc658fc56bb5b9b200d7f4df6e93e1d0d8048 h: refs/heads/master i: 110243: 18f80428b4fad3b2f1767822bcfb437811ffb2e0 v: v3 --- [refs] | 2 +- trunk/Documentation/hwmon/sysfs-interface | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9f83c2f5d722..92d3925d4f8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98dd22c3e086d76058083432d4d8fb85f04bab90 +refs/heads/master: ddedc658fc56bb5b9b200d7f4df6e93e1d0d8048 diff --git a/trunk/Documentation/hwmon/sysfs-interface b/trunk/Documentation/hwmon/sysfs-interface index 2d845730d4e0..6dbfd5efd991 100644 --- a/trunk/Documentation/hwmon/sysfs-interface +++ b/trunk/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 * **********