summaryrefslogtreecommitdiff
path: root/usr/src/dkms_source_tree
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/dkms_source_tree')
-rw-r--r--usr/src/dkms_source_tree/applesmc.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/usr/src/dkms_source_tree/applesmc.c b/usr/src/dkms_source_tree/applesmc.c
index 0f28d91..67626c1 100644
--- a/usr/src/dkms_source_tree/applesmc.c
+++ b/usr/src/dkms_source_tree/applesmc.c
@@ -148,6 +148,13 @@ static const char *temperature_sensors_sets[][41] = {
148/* Set 18: MacBook Pro 2,2 */ 148/* Set 18: MacBook Pro 2,2 */
149 { "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "TM0P", "TTF0", 149 { "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "TM0P", "TTF0",
150 "Th0H", "Th1H", "Tm0P", "Ts0P", NULL }, 150 "Th0H", "Th1H", "Tm0P", "Ts0P", NULL },
151/* Set 19: Macbook Pro 5,3 */
152 { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TG0D",
153 "TG0F", "TG0H", "TG0P", "TG0T", "TN0D", "TN0P", "TTF0", "Th2H",
154 "Tm0P", "Ts0P", "Ts0S", NULL },
155/* Set 20: MacBook Pro 5,4 */
156 { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TN0D",
157 "TN0P", "TTF0", "Th2H", "Ts0P", "Ts0S", NULL },
151}; 158};
152 159
153/* List of keys used to read/write fan speeds */ 160/* List of keys used to read/write fan speeds */
@@ -1360,6 +1367,10 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
1360 { .accelerometer = 0, .light = 0, .temperature_set = 17 }, 1367 { .accelerometer = 0, .light = 0, .temperature_set = 17 },
1361/* MacBook Pro 2,2: accelerometer, backlight and temperature set 18 */ 1368/* MacBook Pro 2,2: accelerometer, backlight and temperature set 18 */
1362 { .accelerometer = 1, .light = 1, .temperature_set = 18 }, 1369 { .accelerometer = 1, .light = 1, .temperature_set = 18 },
1370/* MacBook Pro 5,3: accelerometer, backlight and temperature set 19 */
1371 { .accelerometer = 1, .light = 1, .temperature_set = 19 },
1372/* MacBook Pro 5,4: accelerometer, backlight and temperature set 20 */
1373 { .accelerometer = 1, .light = 1, .temperature_set = 20 },
1363}; 1374};
1364 1375
1365/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". 1376/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1373,6 +1384,14 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
1373 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 1384 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1374 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, 1385 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
1375 &applesmc_dmi_data[7]}, 1386 &applesmc_dmi_data[7]},
1387 { applesmc_dmi_match, "Apple MacBook Pro 5,4", {
1388 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1389 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,4") },
1390 &applesmc_dmi_data[20]},
1391 { applesmc_dmi_match, "Apple MacBook Pro 5,3", {
1392 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1393 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,3") },
1394 &applesmc_dmi_data[19]},
1376 { applesmc_dmi_match, "Apple MacBook Pro 5", { 1395 { applesmc_dmi_match, "Apple MacBook Pro 5", {
1377 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 1396 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1378 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") }, 1397 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") },