aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/applesmc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hwmon/applesmc.c')
-rw-r--r--drivers/hwmon/applesmc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 80d545d3aa12..074f7f4719f3 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -118,6 +118,9 @@ static const char* temperature_sensors_sets[][36] = {
118 "Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, 118 "Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL },
119/* Set 10: iMac 5,1 */ 119/* Set 10: iMac 5,1 */
120 { "TA0P", "TC0D", "TC0P", "TG0D", "TH0P", "TO0P", "Tm0P", NULL }, 120 { "TA0P", "TC0D", "TC0P", "TG0D", "TH0P", "TO0P", "Tm0P", NULL },
121/* Set 11: Macbook 5,1 */
122 { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0P", "TN0D", "TN0P",
123 "TTF0", "Th0H", "Th1H", "ThFH", "Ts0P", "Ts0S", NULL },
121}; 124};
122 125
123/* List of keys used to read/write fan speeds */ 126/* List of keys used to read/write fan speeds */
@@ -1280,6 +1283,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
1280 { .accelerometer = 1, .light = 1, .temperature_set = 9 }, 1283 { .accelerometer = 1, .light = 1, .temperature_set = 9 },
1281/* iMac 5: light sensor only, temperature set 10 */ 1284/* iMac 5: light sensor only, temperature set 10 */
1282 { .accelerometer = 0, .light = 0, .temperature_set = 10 }, 1285 { .accelerometer = 0, .light = 0, .temperature_set = 10 },
1286/* MacBook 5: accelerometer, backlight and temperature set 11 */
1287 { .accelerometer = 1, .light = 1, .temperature_set = 11 },
1283}; 1288};
1284 1289
1285/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". 1290/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1309,6 +1314,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
1309 DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), 1314 DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
1310 DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") }, 1315 DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") },
1311 &applesmc_dmi_data[6]}, 1316 &applesmc_dmi_data[6]},
1317 { applesmc_dmi_match, "Apple MacBook 5", {
1318 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1319 DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5") },
1320 &applesmc_dmi_data[11]},
1312 { applesmc_dmi_match, "Apple MacBook", { 1321 { applesmc_dmi_match, "Apple MacBook", {
1313 DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), 1322 DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
1314 DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") }, 1323 DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },