diff options
author | Edgar Hucek <gimli@dark-green.com> | 2010-11-09 10:15:01 -0500 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2011-01-08 13:55:34 -0500 |
commit | 132af03233b493101a53010383b5abb5b9ff1e51 (patch) | |
tree | 8cf8c64d2399ba39da261d93753d0bbc9c601b03 /drivers/hwmon/applesmc.c | |
parent | 18de030f1dbaef0c13cf393899a298d978aa200f (diff) |
hwmon: (applesmc) Add MacBookAir3,1(3,2) support
This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the
applesmc driver.
[rydberg@euromail.se: minor cleanup]
Cc: stable@kernel.org
Signed-off-by: Edgar Hucek <gimli@dark-green.com>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
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 b6598aa557a0..d616174807a1 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
@@ -162,6 +162,10 @@ static const char *temperature_sensors_sets[][41] = { | |||
162 | /* Set 22: MacBook Pro 7,1 */ | 162 | /* Set 22: MacBook Pro 7,1 */ |
163 | { "TB0T", "TB1T", "TB2T", "TC0D", "TC0P", "TN0D", "TN0P", "TN0S", | 163 | { "TB0T", "TB1T", "TB2T", "TC0D", "TC0P", "TN0D", "TN0P", "TN0S", |
164 | "TN1D", "TN1F", "TN1G", "TN1S", "Th1H", "Ts0P", "Ts0S", NULL }, | 164 | "TN1D", "TN1F", "TN1G", "TN1S", "Th1H", "Ts0P", "Ts0S", NULL }, |
165 | /* Set 23: MacBook Air 3,1 */ | ||
166 | { "TB0T", "TB1T", "TB2T", "TC0D", "TC0E", "TC0P", "TC1E", "TCZ3", | ||
167 | "TCZ4", "TCZ5", "TG0E", "TG1E", "TG2E", "TGZ3", "TGZ4", "TGZ5", | ||
168 | "TH0F", "TH0O", "TM0P" }, | ||
165 | }; | 169 | }; |
166 | 170 | ||
167 | /* List of keys used to read/write fan speeds */ | 171 | /* List of keys used to read/write fan speeds */ |
@@ -1524,11 +1528,17 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { | |||
1524 | { .accelerometer = 1, .light = 1, .temperature_set = 21 }, | 1528 | { .accelerometer = 1, .light = 1, .temperature_set = 21 }, |
1525 | /* MacBook Pro 7,1: accelerometer, backlight and temperature set 22 */ | 1529 | /* MacBook Pro 7,1: accelerometer, backlight and temperature set 22 */ |
1526 | { .accelerometer = 1, .light = 1, .temperature_set = 22 }, | 1530 | { .accelerometer = 1, .light = 1, .temperature_set = 22 }, |
1531 | /* MacBook Air 3,1: accelerometer, backlight and temperature set 23 */ | ||
1532 | { .accelerometer = 0, .light = 0, .temperature_set = 23 }, | ||
1527 | }; | 1533 | }; |
1528 | 1534 | ||
1529 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". | 1535 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". |
1530 | * So we need to put "Apple MacBook Pro" before "Apple MacBook". */ | 1536 | * So we need to put "Apple MacBook Pro" before "Apple MacBook". */ |
1531 | static __initdata struct dmi_system_id applesmc_whitelist[] = { | 1537 | static __initdata struct dmi_system_id applesmc_whitelist[] = { |
1538 | { applesmc_dmi_match, "Apple MacBook Air 3", { | ||
1539 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | ||
1540 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3") }, | ||
1541 | &applesmc_dmi_data[23]}, | ||
1532 | { applesmc_dmi_match, "Apple MacBook Air 2", { | 1542 | { applesmc_dmi_match, "Apple MacBook Air 2", { |
1533 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), | 1543 | DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), |
1534 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir2") }, | 1544 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir2") }, |