diff options
author | Henrik Rydberg <rydberg@euromail.se> | 2008-10-18 23:27:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 11:52:35 -0400 |
commit | 07e8dbd3ebbdedc71335049dd4b0d542cb038d7d (patch) | |
tree | dadf0f3033adf873a9f06d101a10c07f71d9e336 | |
parent | d7549905f157f217b888edb0f2055f5090eaf1d8 (diff) |
hwmon: applesmc: Add support for Macbook Pro 3
Add temperature sensor support for Macbook Pro 3.
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 efca98a2e35f..59266ce60cc2 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
@@ -110,6 +110,9 @@ static const char* temperature_sensors_sets[][36] = { | |||
110 | /* Set 8: Macbook Pro 4,1 (Penryn) */ | 110 | /* Set 8: Macbook Pro 4,1 (Penryn) */ |
111 | { "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", "Th0H", | 111 | { "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", "Th0H", |
112 | "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, | 112 | "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, |
113 | /* Set 9: Macbook Pro 3,1 (Santa Rosa) */ | ||
114 | { "TALP", "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", | ||
115 | "Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, | ||
113 | }; | 116 | }; |
114 | 117 | ||
115 | /* List of keys used to read/write fan speeds */ | 118 | /* List of keys used to read/write fan speeds */ |
@@ -1269,6 +1272,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { | |||
1269 | { .accelerometer = 1, .light = 1, .temperature_set = 7 }, | 1272 | { .accelerometer = 1, .light = 1, .temperature_set = 7 }, |
1270 | /* MacBook Pro 4: accelerometer, backlight and temperature set 8 */ | 1273 | /* MacBook Pro 4: accelerometer, backlight and temperature set 8 */ |
1271 | { .accelerometer = 1, .light = 1, .temperature_set = 8 }, | 1274 | { .accelerometer = 1, .light = 1, .temperature_set = 8 }, |
1275 | /* MacBook Pro 3: accelerometer, backlight and temperature set 9 */ | ||
1276 | { .accelerometer = 1, .light = 1, .temperature_set = 9 }, | ||
1272 | }; | 1277 | }; |
1273 | 1278 | ||
1274 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". | 1279 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". |
@@ -1282,6 +1287,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = { | |||
1282 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | 1287 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), |
1283 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") }, | 1288 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") }, |
1284 | &applesmc_dmi_data[8]}, | 1289 | &applesmc_dmi_data[8]}, |
1290 | { applesmc_dmi_match, "Apple MacBook Pro 3", { | ||
1291 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | ||
1292 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3") }, | ||
1293 | &applesmc_dmi_data[9]}, | ||
1285 | { applesmc_dmi_match, "Apple MacBook Pro", { | 1294 | { applesmc_dmi_match, "Apple MacBook Pro", { |
1286 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), | 1295 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), |
1287 | DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") }, | 1296 | DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") }, |