diff options
-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 ce41a437477..57c033169ac 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
@@ -159,6 +159,9 @@ static const char *temperature_sensors_sets[][41] = { | |||
159 | { "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", "TC0P", "TC1C", "TG0D", | 159 | { "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", "TC0P", "TC1C", "TG0D", |
160 | "TG0P", "TG0T", "TMCD", "TP0P", "TPCD", "Th1H", "Th2H", "Tm0P", | 160 | "TG0P", "TG0T", "TMCD", "TP0P", "TPCD", "Th1H", "Th2H", "Tm0P", |
161 | "Ts0P", "Ts0S", NULL }, | 161 | "Ts0P", "Ts0S", NULL }, |
162 | /* Set 22: MacBook Pro 7,1 */ | ||
163 | { "TB0T", "TB1T", "TB2T", "TC0D", "TC0P", "TN0D", "TN0P", "TN0S", | ||
164 | "TN1D", "TN1F", "TN1G", "TN1S", "Th1H", "Ts0P", "Ts0S", NULL }, | ||
162 | }; | 165 | }; |
163 | 166 | ||
164 | /* List of keys used to read/write fan speeds */ | 167 | /* List of keys used to read/write fan speeds */ |
@@ -1380,6 +1383,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { | |||
1380 | { .accelerometer = 1, .light = 1, .temperature_set = 20 }, | 1383 | { .accelerometer = 1, .light = 1, .temperature_set = 20 }, |
1381 | /* MacBook Pro 6,2: accelerometer, backlight and temperature set 21 */ | 1384 | /* MacBook Pro 6,2: accelerometer, backlight and temperature set 21 */ |
1382 | { .accelerometer = 1, .light = 1, .temperature_set = 21 }, | 1385 | { .accelerometer = 1, .light = 1, .temperature_set = 21 }, |
1386 | /* MacBook Pro 7,1: accelerometer, backlight and temperature set 22 */ | ||
1387 | { .accelerometer = 1, .light = 1, .temperature_set = 22 }, | ||
1383 | }; | 1388 | }; |
1384 | 1389 | ||
1385 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". | 1390 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". |
@@ -1393,6 +1398,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = { | |||
1393 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | 1398 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), |
1394 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, | 1399 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, |
1395 | &applesmc_dmi_data[7]}, | 1400 | &applesmc_dmi_data[7]}, |
1401 | { applesmc_dmi_match, "Apple MacBook Pro 7", { | ||
1402 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | ||
1403 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro7") }, | ||
1404 | &applesmc_dmi_data[22]}, | ||
1396 | { applesmc_dmi_match, "Apple MacBook Pro 5,4", { | 1405 | { applesmc_dmi_match, "Apple MacBook Pro 5,4", { |
1397 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | 1406 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), |
1398 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,4") }, | 1407 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,4") }, |