1 files changed, 17 insertions, 16 deletions
diff --git a/Documentation/hwmon/ibmaem b/Documentation/hwmon/ibmaem
index 2fefaf582a43..e98bdfea3467 100644
--- a/Documentation/hwmon/ibmaem
+++ b/Documentation/hwmon/ibmaem
@@ -1,8 +1,11 @@
 Kernel driver ibmaem
 ======================
+This driver talks to the IBM Systems Director Active Energy Manager, known
+henceforth as AEM.
 Supported systems:
-  * Any recent IBM System X server with Active Energy Manager support.
+  * Any recent IBM System X server with AEM support.
    This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2,
    x3950 M2, and certain HS2x/LS2x/QS2x blades.  The IPMI host interface
    driver ("ipmi-si") needs to be loaded for this driver to do anything.
@@ -14,24 +17,22 @@ Author: Darrick J. Wong
 Description
 -----------
-This driver implements sensor reading support for the energy and power
+This driver implements sensor reading support for the energy and power meters
-meters available on various IBM System X hardware through the BMC.  All
+available on various IBM System X hardware through the BMC.  All sensor banks
-sensor banks will be exported as platform devices; this driver can talk
+will be exported as platform devices; this driver can talk to both v1 and v2
-to both v1 and v2 interfaces.  This driver is completely separate from the
+interfaces.  This driver is completely separate from the older ibmpex driver.
-older ibmpex driver.
-The v1 AEM interface has a simple set of features to monitor energy use.
+The v1 AEM interface has a simple set of features to monitor energy use.  There
-There is a register that displays an estimate of raw energy consumption
+is a register that displays an estimate of raw energy consumption since the
-since the last BMC reset, and a power sensor that returns average power
+last BMC reset, and a power sensor that returns average power use over a
-use over a configurable interval.
+configurable interval.
-The v2 AEM interface is a bit more sophisticated, being able to present
+The v2 AEM interface is a bit more sophisticated, being able to present a wider
-a wider range of energy and power use registers, the power cap as
+range of energy and power use registers, the power cap as set by the AEM
-set by the AEM software, and temperature sensors.
+software, and temperature sensors.
 Special Features
 ----------------
-The "power_cap" value displays the current system power cap, as set by
+The "power_cap" value displays the current system power cap, as set by the AEM
-the Active Energy Manager software.  Setting the power cap from the host
+software.  Setting the power cap from the host is not currently supported.
-is not currently supported.

diff --git a/Documentation/hwmon/ibmaem b/Documentation/hwmon/ibmaem index 2fefaf582a43..e98bdfea3467 100644 --- a/Documentation/hwmon/ibmaem +++ b/Documentation/hwmon/ibmaem
@@ -1,8 +1,11 @@
1	Kernel driver ibmaem	1	Kernel driver ibmaem
2	======================	2	======================
3		3
		4	This driver talks to the IBM Systems Director Active Energy Manager, known
		5	henceforth as AEM.
		6
4	Supported systems:	7	Supported systems:
5	* Any recent IBM System X server with Active Energy Manager support.	8	* Any recent IBM System X server with AEM support.
6	This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2,	9	This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2,
7	x3950 M2, and certain HS2x/LS2x/QS2x blades. The IPMI host interface	10	x3950 M2, and certain HS2x/LS2x/QS2x blades. The IPMI host interface
8	driver ("ipmi-si") needs to be loaded for this driver to do anything.	11	driver ("ipmi-si") needs to be loaded for this driver to do anything.
@@ -14,24 +17,22 @@ Author: Darrick J. Wong
14	Description	17	Description
15	-----------	18	-----------
16		19
17	This driver implements sensor reading support for the energy and power	20	This driver implements sensor reading support for the energy and power meters
18	meters available on various IBM System X hardware through the BMC. All	21	available on various IBM System X hardware through the BMC. All sensor banks
19	sensor banks will be exported as platform devices; this driver can talk	22	will be exported as platform devices; this driver can talk to both v1 and v2
20	to both v1 and v2 interfaces. This driver is completely separate from the	23	interfaces. This driver is completely separate from the older ibmpex driver.
21	older ibmpex driver.
22		24
23	The v1 AEM interface has a simple set of features to monitor energy use.	25	The v1 AEM interface has a simple set of features to monitor energy use. There
24	There is a register that displays an estimate of raw energy consumption	26	is a register that displays an estimate of raw energy consumption since the
25	since the last BMC reset, and a power sensor that returns average power	27	last BMC reset, and a power sensor that returns average power use over a
26	use over a configurable interval.	28	configurable interval.
27		29
28	The v2 AEM interface is a bit more sophisticated, being able to present	30	The v2 AEM interface is a bit more sophisticated, being able to present a wider
29	a wider range of energy and power use registers, the power cap as	31	range of energy and power use registers, the power cap as set by the AEM
30	set by the AEM software, and temperature sensors.	32	software, and temperature sensors.
31		33
32	Special Features	34	Special Features
33	----------------	35	----------------
34		36
35	The "power_cap" value displays the current system power cap, as set by	37	The "power_cap" value displays the current system power cap, as set by the AEM
36	the Active Energy Manager software. Setting the power cap from the host	38	software. Setting the power cap from the host is not currently supported.
37	is not currently supported.