diff options
author | Henrik Rydberg <rydberg@euromail.se> | 2008-11-19 18:36:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-19 21:49:57 -0500 |
commit | 9ca791bbd464d7968db1530b433cc397a4c348c1 (patch) | |
tree | 7fea8360c3f8b8282f7dd4e58e61b91816feb364 /drivers | |
parent | 66359f849074c55fb80d15235ea5b99f1918663c (diff) |
hwmon: applesmc: Add support for iMac 6
Add temperature sensor support for iMac 6.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Tested-by: Caleb Hyde <caleb.hyde@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hwmon/applesmc.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index 488e45cd43d7..10977b3d201c 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
@@ -128,6 +128,9 @@ static const char* temperature_sensors_sets[][36] = { | |||
128 | /* Set 13: iMac 8,1 */ | 128 | /* Set 13: iMac 8,1 */ |
129 | { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P", | 129 | { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P", |
130 | "TL0P", "TO0P", "TW0P", "Tm0P", "Tp0P", NULL }, | 130 | "TL0P", "TO0P", "TW0P", "Tm0P", "Tp0P", NULL }, |
131 | /* Set 14: iMac 6,1 */ | ||
132 | { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P", | ||
133 | "TO0P", "Tp0P", NULL }, | ||
131 | }; | 134 | }; |
132 | 135 | ||
133 | /* List of keys used to read/write fan speeds */ | 136 | /* List of keys used to read/write fan speeds */ |
@@ -1296,6 +1299,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { | |||
1296 | { .accelerometer = 1, .light = 1, .temperature_set = 12 }, | 1299 | { .accelerometer = 1, .light = 1, .temperature_set = 12 }, |
1297 | /* iMac 8: light sensor only, temperature set 13 */ | 1300 | /* iMac 8: light sensor only, temperature set 13 */ |
1298 | { .accelerometer = 0, .light = 0, .temperature_set = 13 }, | 1301 | { .accelerometer = 0, .light = 0, .temperature_set = 13 }, |
1302 | /* iMac 6: light sensor only, temperature set 14 */ | ||
1303 | { .accelerometer = 0, .light = 0, .temperature_set = 14 }, | ||
1299 | }; | 1304 | }; |
1300 | 1305 | ||
1301 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". | 1306 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". |
@@ -1353,6 +1358,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = { | |||
1353 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | 1358 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), |
1354 | DMI_MATCH(DMI_PRODUCT_NAME, "iMac8") }, | 1359 | DMI_MATCH(DMI_PRODUCT_NAME, "iMac8") }, |
1355 | &applesmc_dmi_data[13]}, | 1360 | &applesmc_dmi_data[13]}, |
1361 | { applesmc_dmi_match, "Apple iMac 6", { | ||
1362 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | ||
1363 | DMI_MATCH(DMI_PRODUCT_NAME, "iMac6") }, | ||
1364 | &applesmc_dmi_data[14]}, | ||
1356 | { applesmc_dmi_match, "Apple iMac 5", { | 1365 | { applesmc_dmi_match, "Apple iMac 5", { |
1357 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | 1366 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), |
1358 | DMI_MATCH(DMI_PRODUCT_NAME, "iMac5") }, | 1367 | DMI_MATCH(DMI_PRODUCT_NAME, "iMac5") }, |