Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d7549905f157f217b888edb0f2055f5090eaf1d8

Authored by Henrik Rydberg
Committed by Linus Torvalds
1 parent 7b5e3cb28f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

hwmon: applesmc: Add support for Macbook Pro 4 

Adds temperature sensor support for the Macbook Pro 4.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Cc: Nicolas Boichat <nicolas@boichat.ch>
Cc: Riki Oktarianto <rkoktarianto@gmail.com>
Cc: Mark M. Hoffman <mhoffman@lightlink.com>
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 9 additions and 0 deletions Side-by-side Diff

drivers/hwmon/applesmc.c
Diff comments   View file @ d754990
... ... @@ -107,6 +107,9 @@
107 107 /* Set 7: Macbook Air */
108 108 { "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TC0P", "TCFP",
109 109 "TTF0", "TW0P", "Th0H", "Tp0P", "TpFP", "Ts0P", "Ts0S", NULL },
  110 +/* Set 8: Macbook Pro 4,1 (Penryn) */
  111 + { "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", "Th0H",
  112 + "Th1H", "Th2H", "Tm0P", "Ts0P", NULL },
110 113 };
111 114  
112 115 /* List of keys used to read/write fan speeds */
... ... @@ -1264,6 +1267,8 @@
1264 1267 { .accelerometer = 1, .light = 0, .temperature_set = 6 },
1265 1268 /* MacBook Air: accelerometer, backlight and temperature set 7 */
1266 1269 { .accelerometer = 1, .light = 1, .temperature_set = 7 },
  1270 +/* MacBook Pro 4: accelerometer, backlight and temperature set 8 */
  1271 + { .accelerometer = 1, .light = 1, .temperature_set = 8 },
1267 1272 };
1268 1273  
1269 1274 /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
... ... @@ -1273,6 +1278,10 @@
1273 1278 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1274 1279 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
1275 1280 &applesmc_dmi_data[7]},
  1281 + { applesmc_dmi_match, "Apple MacBook Pro 4", {
  1282 + DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
  1283 + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") },
  1284 + &applesmc_dmi_data[8]},
1276 1285 { applesmc_dmi_match, "Apple MacBook Pro", {
1277 1286 DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
1278 1287 DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") },