diff options
author | Henrik Rydberg <rydberg@euromail.se> | 2008-11-06 15:53:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-06 18:41:17 -0500 |
commit | 6e3530fa241ae759313496f67295c9252691ed04 (patch) | |
tree | 3d0f6f3d5844b6a4eb0f51435b374ae125846515 /drivers | |
parent | 9e3a4afd5a66f9047e30ba225525e6ff01612dc4 (diff) |
hwmon: applesmc: add support for iMac 5
Add temperature sensor support for iMac 5.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Tested-by: Ricky Campbell <johnrcampbell@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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index bc011da79e14..80d545d3aa12 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
@@ -116,6 +116,8 @@ static const char* temperature_sensors_sets[][36] = { | |||
116 | /* Set 9: Macbook Pro 3,1 (Santa Rosa) */ | 116 | /* Set 9: Macbook Pro 3,1 (Santa Rosa) */ |
117 | { "TALP", "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", | 117 | { "TALP", "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", |
118 | "Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, | 118 | "Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, |
119 | /* Set 10: iMac 5,1 */ | ||
120 | { "TA0P", "TC0D", "TC0P", "TG0D", "TH0P", "TO0P", "Tm0P", NULL }, | ||
119 | }; | 121 | }; |
120 | 122 | ||
121 | /* List of keys used to read/write fan speeds */ | 123 | /* List of keys used to read/write fan speeds */ |
@@ -1276,6 +1278,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { | |||
1276 | { .accelerometer = 1, .light = 1, .temperature_set = 8 }, | 1278 | { .accelerometer = 1, .light = 1, .temperature_set = 8 }, |
1277 | /* MacBook Pro 3: accelerometer, backlight and temperature set 9 */ | 1279 | /* MacBook Pro 3: accelerometer, backlight and temperature set 9 */ |
1278 | { .accelerometer = 1, .light = 1, .temperature_set = 9 }, | 1280 | { .accelerometer = 1, .light = 1, .temperature_set = 9 }, |
1281 | /* iMac 5: light sensor only, temperature set 10 */ | ||
1282 | { .accelerometer = 0, .light = 0, .temperature_set = 10 }, | ||
1279 | }; | 1283 | }; |
1280 | 1284 | ||
1281 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". | 1285 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". |
@@ -1317,6 +1321,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = { | |||
1317 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), | 1321 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), |
1318 | DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") }, | 1322 | DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") }, |
1319 | &applesmc_dmi_data[4]}, | 1323 | &applesmc_dmi_data[4]}, |
1324 | { applesmc_dmi_match, "Apple iMac 5", { | ||
1325 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | ||
1326 | DMI_MATCH(DMI_PRODUCT_NAME, "iMac5") }, | ||
1327 | &applesmc_dmi_data[10]}, | ||
1320 | { applesmc_dmi_match, "Apple iMac", { | 1328 | { applesmc_dmi_match, "Apple iMac", { |
1321 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), | 1329 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), |
1322 | DMI_MATCH(DMI_PRODUCT_NAME,"iMac") }, | 1330 | DMI_MATCH(DMI_PRODUCT_NAME,"iMac") }, |