aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorBernhard Froemel <froemel@vmars.tuwien.ac.at>2010-05-27 13:58:52 -0400
committerJean Delvare <khali@linux-fr.org>2010-05-27 13:58:52 -0400
commit872bad55e2d3fcc13e1e8770a3b200f0c6ca5126 (patch)
tree149ed8a4d70db2b04423d86d3e0fa4562914bc73 /drivers/hwmon
parent4e4a99d32721800c061191027f18f780dcbd9e0b (diff)
hwmon: (applesmc) Add generic support for MacBook Pro 6
This patch adds generic support for the MacBook Pro 6 family based on the 6,2 model. [rydberg@euromail.se: patch cleanup] Signed-off-by: Bernhard Froemel <froemel@vmars.tuwien.ac.at> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/applesmc.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index be33094468db..ce41a437477d 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -155,6 +155,10 @@ static const char *temperature_sensors_sets[][41] = {
155/* Set 20: MacBook Pro 5,4 */ 155/* Set 20: MacBook Pro 5,4 */
156 { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TN0D", 156 { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TN0D",
157 "TN0P", "TTF0", "Th2H", "Ts0P", "Ts0S", NULL }, 157 "TN0P", "TTF0", "Th2H", "Ts0P", "Ts0S", NULL },
158/* Set 21: MacBook Pro 6,2 */
159 { "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", "TC0P", "TC1C", "TG0D",
160 "TG0P", "TG0T", "TMCD", "TP0P", "TPCD", "Th1H", "Th2H", "Tm0P",
161 "Ts0P", "Ts0S", NULL },
158}; 162};
159 163
160/* List of keys used to read/write fan speeds */ 164/* List of keys used to read/write fan speeds */
@@ -1374,6 +1378,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
1374 { .accelerometer = 1, .light = 1, .temperature_set = 19 }, 1378 { .accelerometer = 1, .light = 1, .temperature_set = 19 },
1375/* MacBook Pro 5,4: accelerometer, backlight and temperature set 20 */ 1379/* MacBook Pro 5,4: accelerometer, backlight and temperature set 20 */
1376 { .accelerometer = 1, .light = 1, .temperature_set = 20 }, 1380 { .accelerometer = 1, .light = 1, .temperature_set = 20 },
1381/* MacBook Pro 6,2: accelerometer, backlight and temperature set 21 */
1382 { .accelerometer = 1, .light = 1, .temperature_set = 21 },
1377}; 1383};
1378 1384
1379/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". 1385/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1395,6 +1401,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
1395 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 1401 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1396 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,3") }, 1402 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,3") },
1397 &applesmc_dmi_data[19]}, 1403 &applesmc_dmi_data[19]},
1404 { applesmc_dmi_match, "Apple MacBook Pro 6", {
1405 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1406 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro6") },
1407 &applesmc_dmi_data[21]},
1398 { applesmc_dmi_match, "Apple MacBook Pro 5", { 1408 { applesmc_dmi_match, "Apple MacBook Pro 5", {
1399 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 1409 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1400 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") }, 1410 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") },