Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon: (abituguru3) enable DMI probing feature on AW9D-MAX hwmon: (abituguru3) Cosmetic whitespace fixes hwmon: (adt7473) Fix voltage conversion routines hwmon: (lm90) Add support for the LM99 16 degree offset hwmon: (lm90) Fix handling of hysteresis value hwmon-vid: Add support for AMD family 10h CPUs hwmon: (w83781d) Fix linking when built-in
author: Linus Torvalds <torvalds@linux-foundation.org> 2008-10-26 12:36:19 -0400
committer: Linus Torvalds <torvalds@linux-foundation.org> 2008-10-26 12:36:19 -0400
commit: b1cd2ee3b95f1c3108c68c82342c614e58ce1f13 (patch)
tree: f282632a4cd5de359c8ba586371e907ade0543ec
parent: e383d56487062275e9971094f2efcca34227ee60 (diff)
parent: c02d65694debbc82dc48453a9fd52efb036c7258 (diff)
6 files changed, 73 insertions, 45 deletions
diff --git a/Documentation/hwmon/lm90 b/Documentation/hwmon/lm90
index e0d5206d1de3..0e8411710238 100644
--- a/Documentation/hwmon/lm90
+++ b/Documentation/hwmon/lm90
@@ -8,7 +8,7 @@ Supported chips:
    Datasheet: Publicly available at the National Semiconductor website
               http://www.national.com/pf/LM/LM90.html
  * National Semiconductor LM89
-    Prefix: 'lm99'
+    Prefix: 'lm89' (no auto-detection)
    Addresses scanned: I2C 0x4c and 0x4d
    Datasheet: Publicly available at the National Semiconductor website
               http://www.national.com/mpf/LM/LM89.html
diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c
index d9e7a49d6cbf..70bb854086df 100644
--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
@@ -178,7 +178,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "+3.3V",              10, 0, 20, 1, 0 },
                { "5VSB",               11, 0, 30, 1, 0 },
                { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                { "PWM",                26, 1, 1, 1, 0 },
                { "CPU Fan",            32, 2, 60, 1, 0 },
                { "NB Fan",             33, 2, 60, 1, 0 },
@@ -200,7 +200,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "+3.3V",              10, 0, 20, 1, 0 },
                { "5VSB",               11, 0, 30, 1, 0 },
                { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                { "PWM1",               26, 1, 1, 1, 0 },
                { "PWM2",               27, 1, 1, 1, 0 },
                { "PWM3",               28, 1, 1, 1, 0 },
@@ -229,7 +229,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "+3.3V",              10, 0, 20, 1, 0 },
                { "5VSB",               11, 0, 30, 1, 0 },
                { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                { "PWM",                26, 1, 1, 1, 0 },
                { "CPU Fan",            32, 2, 60, 1, 0 },
                { "NB Fan",             33, 2, 60, 1, 0 },
@@ -250,7 +250,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "+3.3V",              10, 0, 20, 1, 0 },
                { "5VSB",               11, 0, 30, 1, 0 },
                { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                { "PWM",                26, 1, 1, 1, 0 },
                { "CPU Fan",            32, 2, 60, 1, 0 },
                { "NB Fan",             33, 2, 60, 1, 0 },
@@ -342,7 +342,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "+3.3V",              10, 0, 20, 1, 0 },
                { "5VSB",               11, 0, 30, 1, 0 },
                { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                { "PWM1",               26, 1, 1, 1, 0 },
                { "PWM2",               27, 1, 1, 1, 0 },
                { "PWM3",               28, 1, 1, 1, 0 },
@@ -371,7 +371,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "+3.3V",              10, 0, 20, 1, 0 },
                { "5VSB",               11, 0, 30, 1, 0 },
                { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                { "PWM",                26, 1, 1, 1, 0 },
                { "CPU Fan",            32, 2, 60, 1, 0 },
                { "NB Fan",             33, 2, 60, 1, 0 },
@@ -402,7 +402,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "AUX3 Fan",           36, 2, 60, 1, 0 },
                { NULL, 0, 0, 0, 0, 0 } }
        },
-        { 0x0016, NULL /* AW9D-MAX, need DMI string */, {
+        { 0x0016, "AW9D-MAX       (Intel i975-ICH7)", {
                { "CPU Core",            0, 0, 10, 1, 0 },
                { "DDR2",                1, 0, 20, 1, 0 },
                { "DDR2 VTT",            2, 0, 10, 1, 0 },
@@ -416,7 +416,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "+3.3V",              10, 0, 20, 1, 0 },
                { "5VSB",               11, 0, 30, 1, 0 },
                { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                { "PWM1",               26, 1, 1, 1, 0 },
                { "PWM2",               27, 1, 1, 1, 0 },
                { "PWM3",               28, 1, 1, 1, 0 },
@@ -446,7 +446,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "ATX +3.3V",          10, 0, 20, 1, 0 },
                { "ATX 5VSB",           11, 0, 30, 1, 0 },
                { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            26, 1, 1, 1, 0 },
+                { "System",             26, 1, 1, 1, 0 },
                { "PWM",                27, 1, 1, 1, 0 },
                { "CPU FAN",            32, 2, 60, 1, 0 },
                { "SYS FAN",            34, 2, 60, 1, 0 },
@@ -469,7 +469,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "+3.3V",              10, 0, 20, 1, 0 },
                { "5VSB",               11, 0, 30, 1, 0 },
                { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                { "PWM Phase1",         26, 1, 1, 1, 0 },
                { "PWM Phase2",         27, 1, 1, 1, 0 },
                { "PWM Phase3",         28, 1, 1, 1, 0 },
@@ -487,7 +487,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "DDR2",               13, 0, 20, 1, 0 },
                { "DDR2 VTT",           14, 0, 10, 1, 0 },
                { "CPU VTT",             3, 0, 20, 1, 0 },
-                { "NB 1.2V ",            4, 0, 10, 1, 0 },
+                { "NB 1.2V",             4, 0, 10, 1, 0 },
                { "SB 1.5V",             6, 0, 10, 1, 0 },
                { "HyperTransport",      5, 0, 10, 1, 0 },
                { "ATX +12V (24-Pin)",  12, 0, 60, 1, 0 },
@@ -496,7 +496,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "ATX +3.3V",          10, 0, 20, 1, 0 },
                { "ATX 5VSB",           11, 0, 30, 1, 0 },
                { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                { "PWM Phase1",         26, 1, 1, 1, 0 },
                { "PWM Phase2",         27, 1, 1, 1, 0 },
                { "PWM Phase3",         28, 1, 1, 1, 0 },
@@ -523,8 +523,8 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                { "+3.3V",              10, 0, 20, 1, 0 },
                { "5VSB",               11, 0, 30, 1, 0 },
                { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
-                { "PWM ",               26, 1, 1, 1, 0 },
+                { "PWM",                26, 1, 1, 1, 0 },
                { "PWM Phase2",         27, 1, 1, 1, 0 },
                { "PWM Phase3",         28, 1, 1, 1, 0 },
                { "PWM Phase4",         29, 1, 1, 1, 0 },
@@ -947,7
author	Linus Torvalds <torvalds@linux-foundation.org>	2008-10-26 12:36:19 -0400
committer	Linus Torvalds <torvalds@linux-foundation.org>	2008-10-26 12:36:19 -0400
commit	b1cd2ee3b95f1c3108c68c82342c614e58ce1f13 (patch)
tree	f282632a4cd5de359c8ba586371e907ade0543ec
parent	e383d56487062275e9971094f2efcca34227ee60 (diff)
parent	c02d65694debbc82dc48453a9fd52efb036c7258 (diff)

diff --git a/Documentation/hwmon/lm90 b/Documentation/hwmon/lm90 index e0d5206d1de3..0e8411710238 100644 --- a/Documentation/hwmon/lm90 +++ b/Documentation/hwmon/lm90
@@ -8,7 +8,7 @@ Supported chips:
8	Datasheet: Publicly available at the National Semiconductor website	8	Datasheet: Publicly available at the National Semiconductor website
9	http://www.national.com/pf/LM/LM90.html	9	http://www.national.com/pf/LM/LM90.html
10	* National Semiconductor LM89	10	* National Semiconductor LM89
11	Prefix: 'lm99'	11	Prefix: 'lm89' (no auto-detection)
12	Addresses scanned: I2C 0x4c and 0x4d	12	Addresses scanned: I2C 0x4c and 0x4d
13	Datasheet: Publicly available at the National Semiconductor website	13	Datasheet: Publicly available at the National Semiconductor website
14	http://www.national.com/mpf/LM/LM89.html	14	http://www.national.com/mpf/LM/LM89.html


diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c index d9e7a49d6cbf..70bb854086df 100644 --- a/drivers/hwmon/abituguru3.c +++ b/drivers/hwmon/abituguru3.c
@@ -178,7 +178,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
178	{ "+3.3V", 10, 0, 20, 1, 0 },	178	{ "+3.3V", 10, 0, 20, 1, 0 },
179	{ "5VSB", 11, 0, 30, 1, 0 },	179	{ "5VSB", 11, 0, 30, 1, 0 },
180	{ "CPU", 24, 1, 1, 1, 0 },	180	{ "CPU", 24, 1, 1, 1, 0 },
181	{ "System ", 25, 1, 1, 1, 0 },	181	{ "System", 25, 1, 1, 1, 0 },
182	{ "PWM", 26, 1, 1, 1, 0 },	182	{ "PWM", 26, 1, 1, 1, 0 },
183	{ "CPU Fan", 32, 2, 60, 1, 0 },	183	{ "CPU Fan", 32, 2, 60, 1, 0 },
184	{ "NB Fan", 33, 2, 60, 1, 0 },	184	{ "NB Fan", 33, 2, 60, 1, 0 },
@@ -200,7 +200,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
200	{ "+3.3V", 10, 0, 20, 1, 0 },	200	{ "+3.3V", 10, 0, 20, 1, 0 },
201	{ "5VSB", 11, 0, 30, 1, 0 },	201	{ "5VSB", 11, 0, 30, 1, 0 },
202	{ "CPU", 24, 1, 1, 1, 0 },	202	{ "CPU", 24, 1, 1, 1, 0 },
203	{ "System ", 25, 1, 1, 1, 0 },	203	{ "System", 25, 1, 1, 1, 0 },
204	{ "PWM1", 26, 1, 1, 1, 0 },	204	{ "PWM1", 26, 1, 1, 1, 0 },
205	{ "PWM2", 27, 1, 1, 1, 0 },	205	{ "PWM2", 27, 1, 1, 1, 0 },
206	{ "PWM3", 28, 1, 1, 1, 0 },	206	{ "PWM3", 28, 1, 1, 1, 0 },
@@ -229,7 +229,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
229	{ "+3.3V", 10, 0, 20, 1, 0 },	229	{ "+3.3V", 10, 0, 20, 1, 0 },
230	{ "5VSB", 11, 0, 30, 1, 0 },	230	{ "5VSB", 11, 0, 30, 1, 0 },
231	{ "CPU", 24, 1, 1, 1, 0 },	231	{ "CPU", 24, 1, 1, 1, 0 },
232	{ "System ", 25, 1, 1, 1, 0 },	232	{ "System", 25, 1, 1, 1, 0 },
233	{ "PWM", 26, 1, 1, 1, 0 },	233	{ "PWM", 26, 1, 1, 1, 0 },
234	{ "CPU Fan", 32, 2, 60, 1, 0 },	234	{ "CPU Fan", 32, 2, 60, 1, 0 },
235	{ "NB Fan", 33, 2, 60, 1, 0 },	235	{ "NB Fan", 33, 2, 60, 1, 0 },
@@ -250,7 +250,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
250	{ "+3.3V", 10, 0, 20, 1, 0 },	250	{ "+3.3V", 10, 0, 20, 1, 0 },
251	{ "5VSB", 11, 0, 30, 1, 0 },	251	{ "5VSB", 11, 0, 30, 1, 0 },
252	{ "CPU", 24, 1, 1, 1, 0 },	252	{ "CPU", 24, 1, 1, 1, 0 },
253	{ "System ", 25, 1, 1, 1, 0 },	253	{ "System", 25, 1, 1, 1, 0 },
254	{ "PWM", 26, 1, 1, 1, 0 },	254	{ "PWM", 26, 1, 1, 1, 0 },
255	{ "CPU Fan", 32, 2, 60, 1, 0 },	255	{ "CPU Fan", 32, 2, 60, 1, 0 },
256	{ "NB Fan", 33, 2, 60, 1, 0 },	256	{ "NB Fan", 33, 2, 60, 1, 0 },
@@ -342,7 +342,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
342	{ "+3.3V", 10, 0, 20, 1, 0 },	342	{ "+3.3V", 10, 0, 20, 1, 0 },
343	{ "5VSB", 11, 0, 30, 1, 0 },	343	{ "5VSB", 11, 0, 30, 1, 0 },
344	{ "CPU", 24, 1, 1, 1, 0 },	344	{ "CPU", 24, 1, 1, 1, 0 },
345	{ "System ", 25, 1, 1, 1, 0 },	345	{ "System", 25, 1, 1, 1, 0 },
346	{ "PWM1", 26, 1, 1, 1, 0 },	346	{ "PWM1", 26, 1, 1, 1, 0 },
347	{ "PWM2", 27, 1, 1, 1, 0 },	347	{ "PWM2", 27, 1, 1, 1, 0 },
348	{ "PWM3", 28, 1, 1, 1, 0 },	348	{ "PWM3", 28, 1, 1, 1, 0 },
@@ -371,7 +371,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
371	{ "+3.3V", 10, 0, 20, 1, 0 },	371	{ "+3.3V", 10, 0, 20, 1, 0 },
372	{ "5VSB", 11, 0, 30, 1, 0 },	372	{ "5VSB", 11, 0, 30, 1, 0 },
373	{ "CPU", 24, 1, 1, 1, 0 },	373	{ "CPU", 24, 1, 1, 1, 0 },
374	{ "System ", 25, 1, 1, 1, 0 },	374	{ "System", 25, 1, 1, 1, 0 },
375	{ "PWM", 26, 1, 1, 1, 0 },	375	{ "PWM", 26, 1, 1, 1, 0 },
376	{ "CPU Fan", 32, 2, 60, 1, 0 },	376	{ "CPU Fan", 32, 2, 60, 1, 0 },
377	{ "NB Fan", 33, 2, 60, 1, 0 },	377	{ "NB Fan", 33, 2, 60, 1, 0 },
@@ -402,7 +402,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
402	{ "AUX3 Fan", 36, 2, 60, 1, 0 },	402	{ "AUX3 Fan", 36, 2, 60, 1, 0 },
403	{ NULL, 0, 0, 0, 0, 0 } }	403	{ NULL, 0, 0, 0, 0, 0 } }
404	},	404	},
405	{ 0x0016, NULL /* AW9D-MAX, need DMI string */, {	405	{ 0x0016, "AW9D-MAX (Intel i975-ICH7)", {
406	{ "CPU Core", 0, 0, 10, 1, 0 },	406	{ "CPU Core", 0, 0, 10, 1, 0 },
407	{ "DDR2", 1, 0, 20, 1, 0 },	407	{ "DDR2", 1, 0, 20, 1, 0 },
408	{ "DDR2 VTT", 2, 0, 10, 1, 0 },	408	{ "DDR2 VTT", 2, 0, 10, 1, 0 },
@@ -416,7 +416,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
416	{ "+3.3V", 10, 0, 20, 1, 0 },	416	{ "+3.3V", 10, 0, 20, 1, 0 },
417	{ "5VSB", 11, 0, 30, 1, 0 },	417	{ "5VSB", 11, 0, 30, 1, 0 },
418	{ "CPU", 24, 1, 1, 1, 0 },	418	{ "CPU", 24, 1, 1, 1, 0 },
419	{ "System ", 25, 1, 1, 1, 0 },	419	{ "System", 25, 1, 1, 1, 0 },
420	{ "PWM1", 26, 1, 1, 1, 0 },	420	{ "PWM1", 26, 1, 1, 1, 0 },
421	{ "PWM2", 27, 1, 1, 1, 0 },	421	{ "PWM2", 27, 1, 1, 1, 0 },
422	{ "PWM3", 28, 1, 1, 1, 0 },	422	{ "PWM3", 28, 1, 1, 1, 0 },
@@ -446,7 +446,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
446	{ "ATX +3.3V", 10, 0, 20, 1, 0 },	446	{ "ATX +3.3V", 10, 0, 20, 1, 0 },
447	{ "ATX 5VSB", 11, 0, 30, 1, 0 },	447	{ "ATX 5VSB", 11, 0, 30, 1, 0 },
448	{ "CPU", 24, 1, 1, 1, 0 },	448	{ "CPU", 24, 1, 1, 1, 0 },
449	{ "System ", 26, 1, 1, 1, 0 },	449	{ "System", 26, 1, 1, 1, 0 },
450	{ "PWM", 27, 1, 1, 1, 0 },	450	{ "PWM", 27, 1, 1, 1, 0 },
451	{ "CPU FAN", 32, 2, 60, 1, 0 },	451	{ "CPU FAN", 32, 2, 60, 1, 0 },
452	{ "SYS FAN", 34, 2, 60, 1, 0 },	452	{ "SYS FAN", 34, 2, 60, 1, 0 },
@@ -469,7 +469,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
469	{ "+3.3V", 10, 0, 20, 1, 0 },	469	{ "+3.3V", 10, 0, 20, 1, 0 },
470	{ "5VSB", 11, 0, 30, 1, 0 },	470	{ "5VSB", 11, 0, 30, 1, 0 },
471	{ "CPU", 24, 1, 1, 1, 0 },	471	{ "CPU", 24, 1, 1, 1, 0 },
472	{ "System ", 25, 1, 1, 1, 0 },	472	{ "System", 25, 1, 1, 1, 0 },
473	{ "PWM Phase1", 26, 1, 1, 1, 0 },	473	{ "PWM Phase1", 26, 1, 1, 1, 0 },
474	{ "PWM Phase2", 27, 1, 1, 1, 0 },	474	{ "PWM Phase2", 27, 1, 1, 1, 0 },
475	{ "PWM Phase3", 28, 1, 1, 1, 0 },	475	{ "PWM Phase3", 28, 1, 1, 1, 0 },
@@ -487,7 +487,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
487	{ "DDR2", 13, 0, 20, 1, 0 },	487	{ "DDR2", 13, 0, 20, 1, 0 },
488	{ "DDR2 VTT", 14, 0, 10, 1, 0 },	488	{ "DDR2 VTT", 14, 0, 10, 1, 0 },
489	{ "CPU VTT", 3, 0, 20, 1, 0 },	489	{ "CPU VTT", 3, 0, 20, 1, 0 },
490	{ "NB 1.2V ", 4, 0, 10, 1, 0 },	490	{ "NB 1.2V", 4, 0, 10, 1, 0 },
491	{ "SB 1.5V", 6, 0, 10, 1, 0 },	491	{ "SB 1.5V", 6, 0, 10, 1, 0 },
492	{ "HyperTransport", 5, 0, 10, 1, 0 },	492	{ "HyperTransport", 5, 0, 10, 1, 0 },
493	{ "ATX +12V (24-Pin)", 12, 0, 60, 1, 0 },	493	{ "ATX +12V (24-Pin)", 12, 0, 60, 1, 0 },
@@ -496,7 +496,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
496	{ "ATX +3.3V", 10, 0, 20, 1, 0 },	496	{ "ATX +3.3V", 10, 0, 20, 1, 0 },
497	{ "ATX 5VSB", 11, 0, 30, 1, 0 },	497	{ "ATX 5VSB", 11, 0, 30, 1, 0 },
498	{ "CPU", 24, 1, 1, 1, 0 },	498	{ "CPU", 24, 1, 1, 1, 0 },
499	{ "System ", 25, 1, 1, 1, 0 },	499	{ "System", 25, 1, 1, 1, 0 },
500	{ "PWM Phase1", 26, 1, 1, 1, 0 },	500	{ "PWM Phase1", 26, 1, 1, 1, 0 },
501	{ "PWM Phase2", 27, 1, 1, 1, 0 },	501	{ "PWM Phase2", 27, 1, 1, 1, 0 },
502	{ "PWM Phase3", 28, 1, 1, 1, 0 },	502	{ "PWM Phase3", 28, 1, 1, 1, 0 },
@@ -523,8 +523,8 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
523	{ "+3.3V", 10, 0, 20, 1, 0 },	523	{ "+3.3V", 10, 0, 20, 1, 0 },
524	{ "5VSB", 11, 0, 30, 1, 0 },	524	{ "5VSB", 11, 0, 30, 1, 0 },
525	{ "CPU", 24, 1, 1, 1, 0 },	525	{ "CPU", 24, 1, 1, 1, 0 },
526	{ "System ", 25, 1, 1, 1, 0 },	526	{ "System", 25, 1, 1, 1, 0 },
527	{ "PWM ", 26, 1, 1, 1, 0 },	527	{ "PWM", 26, 1, 1, 1, 0 },
528	{ "PWM Phase2", 27, 1, 1, 1, 0 },	528	{ "PWM Phase2", 27, 1, 1, 1, 0 },
529	{ "PWM Phase3", 28, 1, 1, 1, 0 },	529	{ "PWM Phase3", 28, 1, 1, 1, 0 },
530	{ "PWM Phase4", 29, 1, 1, 1, 0 },	530	{ "PWM Phase4", 29, 1, 1, 1, 0 },
@@ -947,7