aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2008-11-06 15:53:22 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-06 18:41:17 -0500
commiteefc488f96cdde6e152b45675b50bf380b95d99f (patch)
tree6cc27caa38ecfb750336dc71e7eadae45ca5e924
parenta66603257bf88bbe2c9fd6a97ee5dc24de15d196 (diff)
hwmon: applesmc: add support for iMac 8
Add temperature sensor support for iMac 8. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Tested-by: Klaus Doblmann <klaus.doblmann@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/hwmon/applesmc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 9f04283beaee..be3285912cb7 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -125,6 +125,9 @@ static const char* temperature_sensors_sets[][36] = {
125 { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TG0D", 125 { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TG0D",
126 "TG0F", "TG0H", "TG0P", "TG0T", "TG1H", "TN0D", "TN0P", "TTF0", 126 "TG0F", "TG0H", "TG0P", "TG0T", "TG1H", "TN0D", "TN0P", "TTF0",
127 "Th2H", "Tm0P", "Ts0P", "Ts0S", NULL }, 127 "Th2H", "Tm0P", "Ts0P", "Ts0S", NULL },
128/* Set 13: iMac 8,1 */
129 { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P",
130 "TL0P", "TO0P", "TW0P", "Tm0P", "Tp0P", NULL },
128}; 131};
129 132
130/* List of keys used to read/write fan speeds */ 133/* List of keys used to read/write fan speeds */
@@ -1291,6 +1294,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
1291 { .accelerometer = 1, .light = 1, .temperature_set = 11 }, 1294 { .accelerometer = 1, .light = 1, .temperature_set = 11 },
1292/* MacBook Pro 5: accelerometer, backlight and temperature set 12 */ 1295/* MacBook Pro 5: accelerometer, backlight and temperature set 12 */
1293 { .accelerometer = 1, .light = 1, .temperature_set = 12 }, 1296 { .accelerometer = 1, .light = 1, .temperature_set = 12 },
1297/* iMac 8: light sensor only, temperature set 13 */
1298 { .accelerometer = 0, .light = 0, .temperature_set = 13 },
1294}; 1299};
1295 1300
1296/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". 1301/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1340,6 +1345,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
1340 DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), 1345 DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
1341 DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") }, 1346 DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
1342 &applesmc_dmi_data[4]}, 1347 &applesmc_dmi_data[4]},
1348 { applesmc_dmi_match, "Apple iMac 8", {
1349 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1350 DMI_MATCH(DMI_PRODUCT_NAME, "iMac8") },
1351 &applesmc_dmi_data[13]},
1343 { applesmc_dmi_match, "Apple iMac 5", { 1352 { applesmc_dmi_match, "Apple iMac 5", {
1344 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 1353 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1345 DMI_MATCH(DMI_PRODUCT_NAME, "iMac5") }, 1354 DMI_MATCH(DMI_PRODUCT_NAME, "iMac5") },