summaryrefslogtreecommitdiff
path: root/usr/src/dkms_source_tree/applesmc.c
diff options
context:
space:
mode:
authorBernhard Froemel <froemel@vmars.tuwien.ac.at>2010-04-30 08:44:31 +0200
committerHenrik Rydberg <rydberg@euromail.se>2010-04-30 09:15:43 +0200
commit753f9f06b42a614a44f65dda47b93e2bdf67617b (patch)
tree1ef9038a43c1d20639597da2a0aa9ffdf4304041 /usr/src/dkms_source_tree/applesmc.c
parent51904cd35ad3d3463d17a46af2ee3b77f684cffe (diff)
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>
Diffstat (limited to 'usr/src/dkms_source_tree/applesmc.c')
-rw-r--r--usr/src/dkms_source_tree/applesmc.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/usr/src/dkms_source_tree/applesmc.c b/usr/src/dkms_source_tree/applesmc.c
index 67626c1..2ea6e67 100644
--- a/usr/src/dkms_source_tree/applesmc.c
+++ b/usr/src/dkms_source_tree/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 */
@@ -1371,6 +1375,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
1371 { .accelerometer = 1, .light = 1, .temperature_set = 19 }, 1375 { .accelerometer = 1, .light = 1, .temperature_set = 19 },
1372/* MacBook Pro 5,4: accelerometer, backlight and temperature set 20 */ 1376/* MacBook Pro 5,4: accelerometer, backlight and temperature set 20 */
1373 { .accelerometer = 1, .light = 1, .temperature_set = 20 }, 1377 { .accelerometer = 1, .light = 1, .temperature_set = 20 },
1378/* MacBook Pro 6,2: accelerometer, backlight and temperature set 21 */
1379 { .accelerometer = 1, .light = 1, .temperature_set = 21 },
1374}; 1380};
1375 1381
1376/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". 1382/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1392,6 +1398,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
1392 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 1398 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1393 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,3") }, 1399 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,3") },
1394 &applesmc_dmi_data[19]}, 1400 &applesmc_dmi_data[19]},
1401 { applesmc_dmi_match, "Apple MacBook Pro 6", {
1402 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1403 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro6") },
1404 &applesmc_dmi_data[21]},
1395 { applesmc_dmi_match, "Apple MacBook Pro 5", { 1405 { applesmc_dmi_match, "Apple MacBook Pro 5", {
1396 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 1406 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1397 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") }, 1407 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") },