diff options
author | Henrik Rydberg <rydberg@euromail.se> | 2009-01-06 17:41:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:18 -0500 |
commit | 85e0e5ad1ef8cebd010bbd7047418a47ca9c5ead (patch) | |
tree | a194b08fe94a7da1db4436c74732ab34e47e2bdf /drivers/hwmon/applesmc.c | |
parent | 44ea9c809db6cd373448e77c4be424b534f2051f (diff) |
hwmon: applesmc: Add support for MacBook Air 2
Add temperature sensor support for MacBook Air 2.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Cc: Nicolas Boichat <nicolas@boichat.ch>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/hwmon/applesmc.c')
-rw-r--r-- | drivers/hwmon/applesmc.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index 086c2a5cef0b..dca47a591baf 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
@@ -131,6 +131,10 @@ static const char* temperature_sensors_sets[][36] = { | |||
131 | /* Set 14: iMac 6,1 */ | 131 | /* Set 14: iMac 6,1 */ |
132 | { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P", | 132 | { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P", |
133 | "TO0P", "Tp0P", NULL }, | 133 | "TO0P", "Tp0P", NULL }, |
134 | /* Set 15: MacBook Air 2,1 */ | ||
135 | { "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TN0D", "TTF0", | ||
136 | "TV0P", "TVFP", "TW0P", "Th0P", "Tp0P", "Tp1P", "TpFP", "Ts0P", | ||
137 | "Ts0S", NULL }, | ||
134 | }; | 138 | }; |
135 | 139 | ||
136 | /* List of keys used to read/write fan speeds */ | 140 | /* List of keys used to read/write fan speeds */ |
@@ -1301,11 +1305,17 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { | |||
1301 | { .accelerometer = 0, .light = 0, .temperature_set = 13 }, | 1305 | { .accelerometer = 0, .light = 0, .temperature_set = 13 }, |
1302 | /* iMac 6: light sensor only, temperature set 14 */ | 1306 | /* iMac 6: light sensor only, temperature set 14 */ |
1303 | { .accelerometer = 0, .light = 0, .temperature_set = 14 }, | 1307 | { .accelerometer = 0, .light = 0, .temperature_set = 14 }, |
1308 | /* MacBook Air 2,1: accelerometer, backlight and temperature set 15 */ | ||
1309 | { .accelerometer = 1, .light = 1, .temperature_set = 15 }, | ||
1304 | }; | 1310 | }; |
1305 | 1311 | ||
1306 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". | 1312 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". |
1307 | * So we need to put "Apple MacBook Pro" before "Apple MacBook". */ | 1313 | * So we need to put "Apple MacBook Pro" before "Apple MacBook". */ |
1308 | static __initdata struct dmi_system_id applesmc_whitelist[] = { | 1314 | static __initdata struct dmi_system_id applesmc_whitelist[] = { |
1315 | { applesmc_dmi_match, "Apple MacBook Air 2", { | ||
1316 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | ||
1317 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir2") }, | ||
1318 | &applesmc_dmi_data[15]}, | ||
1309 | { applesmc_dmi_match, "Apple MacBook Air", { | 1319 | { applesmc_dmi_match, "Apple MacBook Air", { |
1310 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | 1320 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), |
1311 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, | 1321 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, |