summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2010-04-30 08:45:48 +0200
committerHenrik Rydberg <rydberg@euromail.se>2010-04-30 09:15:43 +0200
commitc8249869c56cdc23c005e87aedea9a06276d643d (patch)
tree55116f9b7f3ffa4600316a3eaa3de2cee8c92c29
parent753f9f06b42a614a44f65dda47b93e2bdf67617b (diff)
Add generic support for MacBook Pro 7
This patch adds generic support for the MacBook Pro 7 family based on the 7,1 model. Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
-rw-r--r--usr/src/dkms_source_tree/applesmc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/usr/src/dkms_source_tree/applesmc.c b/usr/src/dkms_source_tree/applesmc.c
index 2ea6e67..36a0d62 100644
--- a/usr/src/dkms_source_tree/applesmc.c
+++ b/usr/src/dkms_source_tree/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 */
@@ -1377,6 +1380,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
1377 { .accelerometer = 1, .light = 1, .temperature_set = 20 }, 1380 { .accelerometer = 1, .light = 1, .temperature_set = 20 },
1378/* MacBook Pro 6,2: accelerometer, backlight and temperature set 21 */ 1381/* MacBook Pro 6,2: accelerometer, backlight and temperature set 21 */
1379 { .accelerometer = 1, .light = 1, .temperature_set = 21 }, 1382 { .accelerometer = 1, .light = 1, .temperature_set = 21 },
1383/* MacBook Pro 7,1: accelerometer, backlight and temperature set 22 */
1384 { .accelerometer = 1, .light = 1, .temperature_set = 22 },
1380}; 1385};
1381 1386
1382/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". 1387/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1390,6 +1395,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
1390 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 1395 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1391 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, 1396 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
1392 &applesmc_dmi_data[7]}, 1397 &applesmc_dmi_data[7]},
1398 { applesmc_dmi_match, "Apple MacBook Pro 7", {
1399 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1400 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro7") },
1401 &applesmc_dmi_data[22]},
1393 { applesmc_dmi_match, "Apple MacBook Pro 5,4", { 1402 { applesmc_dmi_match, "Apple MacBook Pro 5,4", {
1394 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 1403 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1395 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,4") }, 1404 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,4") },