aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2008-10-18 23:27:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-20 11:52:35 -0400
commitf5274c972bac2d14c092a9c634e03f51785c7b76 (patch)
tree3cb7e827ea6b364c1f3a0a10c66f023a6aa96d9d /drivers/hwmon
parent8bd1a12a51871f0c870612d8220b1485d6aefc73 (diff)
hwmon: applesmc: add support for Macbook Air
This patch adds accelerometer, backlight and temperature sensor support for the Macbook Air. 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>
Diffstat (limited to 'drivers/hwmon')
-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 de696b67a4fc..b57bd82504a7 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -104,6 +104,9 @@ static const char* temperature_sensors_sets[][36] = {
104/* Set 6: Macbook3 set */ 104/* Set 6: Macbook3 set */
105 { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TTF0", "TW0P", "Th0H", 105 { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TTF0", "TW0P", "Th0H",
106 "Th0S", "Th1H", NULL }, 106 "Th0S", "Th1H", NULL },
107/* Set 7: Macbook Air */
108 { "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TC0P", "TCFP",
109 "TTF0", "TW0P", "Th0H", "Tp0P", "TpFP", "Ts0P", "Ts0S", NULL },
107}; 110};
108 111
109/* List of keys used to read/write fan speeds */ 112/* List of keys used to read/write fan speeds */
@@ -1259,11 +1262,17 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
1259 { .accelerometer = 0, .light = 0, .temperature_set = 5 }, 1262 { .accelerometer = 0, .light = 0, .temperature_set = 5 },
1260/* MacBook3: accelerometer and temperature set 6 */ 1263/* MacBook3: accelerometer and temperature set 6 */
1261 { .accelerometer = 1, .light = 0, .temperature_set = 6 }, 1264 { .accelerometer = 1, .light = 0, .temperature_set = 6 },
1265/* MacBook Air: accelerometer, backlight and temperature set 7 */
1266 { .accelerometer = 1, .light = 1, .temperature_set = 7 },
1262}; 1267};
1263 1268
1264/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". 1269/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
1265 * So we need to put "Apple MacBook Pro" before "Apple MacBook". */ 1270 * So we need to put "Apple MacBook Pro" before "Apple MacBook". */
1266static __initdata struct dmi_system_id applesmc_whitelist[] = { 1271static __initdata struct dmi_system_id applesmc_whitelist[] = {
1272 { applesmc_dmi_match, "Apple MacBook Air", {
1273 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1274 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
1275 (void*)&applesmc_dmi_data[7]},
1267 { applesmc_dmi_match, "Apple MacBook Pro", { 1276 { applesmc_dmi_match, "Apple MacBook Pro", {
1268 DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), 1277 DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
1269 DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") }, 1278 DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") },