aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 074f7f4719f3..9f04283beaee 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -121,6 +121,10 @@ static const char* temperature_sensors_sets[][36] = {
121/* Set 11: Macbook 5,1 */ 121/* Set 11: Macbook 5,1 */
122 { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0P", "TN0D", "TN0P", 122 { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0P", "TN0D", "TN0P",
123 "TTF0", "Th0H", "Th1H", "ThFH", "Ts0P", "Ts0S", NULL }, 123 "TTF0", "Th0H", "Th1H", "ThFH", "Ts0P", "Ts0S", NULL },
124/* Set 12: Macbook Pro 5,1 */
125 { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TG0D",
126 "TG0F", "TG0H", "TG0P", "TG0T", "TG1H", "TN0D", "TN0P", "TTF0",
127 "Th2H", "Tm0P", "Ts0P", "Ts0S", NULL },
124}; 128};
125 129
126/* List of keys used to read/write fan speeds */ 130/* List of keys used to read/write fan speeds */
@@ -1285,6 +1289,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
1285 { .accelerometer = 0, .light = 0, .temperature_set = 10 }, 1289 { .accelerometer = 0, .light = 0, .temperature_set = 10 },
1286/* MacBook 5: accelerometer, backlight and temperature set 11 */ 1290/* MacBook 5: accelerometer, backlight and temperature set 11 */
1287 { .accelerometer = 1, .light = 1, .temperature_set = 11 }, 1291 { .accelerometer = 1, .light = 1, .temperature_set = 11 },
1292/* MacBook Pro 5: accelerometer, backlight and temperature set 12 */
1293 { .accelerometer = 1, .light = 1, .temperature_set = 12 },
1288}; 1294};
1289 1295
1290/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". 1296/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1294,6 +1300,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
1294 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 1300 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1295 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, 1301 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
1296 &applesmc_dmi_data[7]}, 1302 &applesmc_dmi_data[7]},
1303 { applesmc_dmi_match, "Apple MacBook Pro 5", {
1304 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1305 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") },
1306 &applesmc_dmi_data[12]},
1297 { applesmc_dmi_match, "Apple MacBook Pro 4", { 1307 { applesmc_dmi_match, "Apple MacBook Pro 4", {
1298 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 1308 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1299 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") }, 1309 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") },