diff options
author | Henrik Rydberg <rydberg@euromail.se> | 2008-10-18 23:27:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 11:52:35 -0400 |
commit | d7549905f157f217b888edb0f2055f5090eaf1d8 (patch) | |
tree | 7b2a2c37b24ec4c533a2df1a5f3408d5e1905d33 | |
parent | 7b5e3cb28f52f42d8cf2b36771be580f33bbc7ae (diff) |
hwmon: applesmc: Add support for Macbook Pro 4
Adds temperature sensor support for the Macbook Pro 4.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Cc: Nicolas Boichat <nicolas@boichat.ch>
Cc: Riki Oktarianto <rkoktarianto@gmail.com>
Cc: Mark M. Hoffman <mhoffman@lightlink.com>
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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 208520c6eb0e..efca98a2e35f 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
@@ -107,6 +107,9 @@ static const char* temperature_sensors_sets[][36] = { | |||
107 | /* Set 7: Macbook Air */ | 107 | /* Set 7: Macbook Air */ |
108 | { "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TC0P", "TCFP", | 108 | { "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TC0P", "TCFP", |
109 | "TTF0", "TW0P", "Th0H", "Tp0P", "TpFP", "Ts0P", "Ts0S", NULL }, | 109 | "TTF0", "TW0P", "Th0H", "Tp0P", "TpFP", "Ts0P", "Ts0S", NULL }, |
110 | /* Set 8: Macbook Pro 4,1 (Penryn) */ | ||
111 | { "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", "Th0H", | ||
112 | "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, | ||
110 | }; | 113 | }; |
111 | 114 | ||
112 | /* List of keys used to read/write fan speeds */ | 115 | /* List of keys used to read/write fan speeds */ |
@@ -1264,6 +1267,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { | |||
1264 | { .accelerometer = 1, .light = 0, .temperature_set = 6 }, | 1267 | { .accelerometer = 1, .light = 0, .temperature_set = 6 }, |
1265 | /* MacBook Air: accelerometer, backlight and temperature set 7 */ | 1268 | /* MacBook Air: accelerometer, backlight and temperature set 7 */ |
1266 | { .accelerometer = 1, .light = 1, .temperature_set = 7 }, | 1269 | { .accelerometer = 1, .light = 1, .temperature_set = 7 }, |
1270 | /* MacBook Pro 4: accelerometer, backlight and temperature set 8 */ | ||
1271 | { .accelerometer = 1, .light = 1, .temperature_set = 8 }, | ||
1267 | }; | 1272 | }; |
1268 | 1273 | ||
1269 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". | 1274 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". |
@@ -1273,6 +1278,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = { | |||
1273 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | 1278 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), |
1274 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, | 1279 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, |
1275 | &applesmc_dmi_data[7]}, | 1280 | &applesmc_dmi_data[7]}, |
1281 | { applesmc_dmi_match, "Apple MacBook Pro 4", { | ||
1282 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | ||
1283 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") }, | ||
1284 | &applesmc_dmi_data[8]}, | ||
1276 | { applesmc_dmi_match, "Apple MacBook Pro", { | 1285 | { applesmc_dmi_match, "Apple MacBook Pro", { |
1277 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), | 1286 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), |
1278 | DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") }, | 1287 | DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") }, |