3 files changed, 64 insertions, 7 deletions

diff --git a/Documentation/hwmon/ltc4215 b/Documentation/hwmon/ltc4215
index 2e6a21eb656c..c196a1846259 100644
--- a/Documentation/hwmon/ltc4215
+++ b/Documentation/hwmon/ltc4215
@@ -22,12 +22,13 @@ Usage Notes
 -----------
 
 This driver does not probe for LTC4215 devices, due to the fact that some
-of the possible addresses are unfriendly to probing. You will need to use
-the "force" parameter to tell the driver where to find the device.
+of the possible addresses are unfriendly to probing. You will have to
+instantiate the devices explicitly.
 
 Example: the following will load the driver for an LTC4215 at address 0x44
 on I2C bus #0:
-$ modprobe ltc4215 force=0,0x44
+$ modprobe ltc4215
+$ echo ltc4215 0x44 > /sys/bus/i2c/devices/i2c-0/new_device
 
 
 Sysfs entries
diff --git a/Documentation/hwmon/ltc4245 b/Documentation/hwmon/ltc4245
index bae7a3adc5d8..02838a47d862 100644
--- a/Documentation/hwmon/ltc4245
+++ b/Documentation/hwmon/ltc4245
@@ -23,12 +23,13 @@ Usage Notes
 -----------
 
 This driver does not probe for LTC4245 devices, due to the fact that some
-of the possible addresses are unfriendly to probing. You will need to use
-the "force" parameter to tell the driver where to find the device.
+of the possible addresses are unfriendly to probing. You will have to
+instantiate the devices explicitly.
 
 Example: the following will load the driver for an LTC4245 at address 0x23
 on I2C bus #1:
-$ modprobe ltc4245 force=1,0x23
+$ modprobe ltc4245
+$ echo ltc4245 0x23 > /sys/bus/i2c/devices/i2c-1/new_device
 
 
 Sysfs entries
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index dcbd502c8792..82def883361b 100644
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -353,10 +353,20 @@ power[1-*]_average		Average power use
                                 Unit: microWatt
                                 RO
 
-power[1-*]_average_interval     Power use averaging interval
+power[1-*]_average_interval     Power use averaging interval.  A poll
+                                notification is sent to this file if the
+                                hardware changes the averaging interval.
                                 Unit: milliseconds
                                 RW
 
+power[1-*]_average_interval_max Maximum power use averaging interval
+                                Unit: milliseconds
+                                RO
+
+power[1-*]_average_interval_min Minimum power use averaging interval
+                                Unit: milliseconds
+                                RO
+
 power[1-*]_average_highest      Historical average maximum power use
                                 Unit: microWatt
                                 RO
@@ -365,6 +375,18 @@ power[1-*]_average_lowest	Historical average minimum power use
                                 Unit: microWatt
                                 RO
 
+power[1-*]_average_max          A poll notification is sent to
+                                power[1-*]_average when power use
+                                rises above this value.
+                                Unit: microWatt
+                                RW
+
+power[1-*]_average_min          A poll notification is sent to
+                                power[1-*]_average when power use
+                                sinks below this value.
+                                Unit: microWatt
+                                RW
+
 power[1-*]_input                Instantaneous power use
                                 Unit: microWatt
                                 RO
@@ -381,6 +403,39 @@ power[1-*]_reset_history	Reset input_highest, input_lowest,
                                 average_highest and average_lowest.
                                 WO
 
+power[1-*]_accuracy             Accuracy of the power meter.
+                                Unit: Percent
+                                RO
+
+power[1-*]_alarm                1 if the system is drawing more power than the
+                                cap allows; 0 otherwise.  A poll notification is
+                                sent to this file when the power use exceeds the
+                                cap.  This file only appears if the cap is known
+                                to be enforced by hardware.
+                                RO
+
+power[1-*]_cap                  If power use rises above this limit, the
+                                system should take action to reduce power use.
+                                A poll notification is sent to this file if the
+                                cap is changed by the hardware.  The *_cap
+                                files only appear if the cap is known to be
+                                enforced by hardware.
+                                Unit: microWatt
+                                RW
+
+power[1-*]_cap_hyst             Margin of hysteresis built around capping and
+                                notification.
+                                Unit: microWatt
+                                RW
+
+power[1-*]_cap_max              Maximum cap that can be set.
+                                Unit: microWatt
+                                RO
+
+power[1-*]_cap_min              Minimum cap that can be set.
+                                Unit: microWatt
+                                RO
+
 **********
 * Energy *
 **********