| From cbeedc14f5b151944ce00b4d91cfd0cc3cf8fab4 Mon Sep 17 00:00:00 2001 |
| From: Bernhard Froemel <froemel@vmars.tuwien.ac.at> |
| Date: Thu, 27 May 2010 19:58:52 +0200 |
| Subject: hwmon: (applesmc) Add generic support for MacBook Pro 6 |
| |
| From: Bernhard Froemel <froemel@vmars.tuwien.ac.at> |
| |
| commit 872bad55e2d3fcc13e1e8770a3b200f0c6ca5126 upstream. |
| |
| This patch adds generic support for the MacBook Pro 6 family |
| based on the 6,2 model. |
| |
| [rydberg@euromail.se: patch cleanup] |
| Signed-off-by: Bernhard Froemel <froemel@vmars.tuwien.ac.at> |
| Signed-off-by: Henrik Rydberg <rydberg@euromail.se> |
| Signed-off-by: Jean Delvare <khali@linux-fr.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| drivers/hwmon/applesmc.c | 10 ++++++++++ |
| 1 file changed, 10 insertions(+) |
| |
| --- a/drivers/hwmon/applesmc.c |
| +++ b/drivers/hwmon/applesmc.c |
| @@ -155,6 +155,10 @@ static const char *temperature_sensors_s |
| /* Set 20: MacBook Pro 5,4 */ |
| { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TN0D", |
| "TN0P", "TTF0", "Th2H", "Ts0P", "Ts0S", NULL }, |
| +/* Set 21: MacBook Pro 6,2 */ |
| + { "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", "TC0P", "TC1C", "TG0D", |
| + "TG0P", "TG0T", "TMCD", "TP0P", "TPCD", "Th1H", "Th2H", "Tm0P", |
| + "Ts0P", "Ts0S", NULL }, |
| }; |
| |
| /* List of keys used to read/write fan speeds */ |
| @@ -1371,6 +1375,8 @@ static __initdata struct dmi_match_data |
| { .accelerometer = 1, .light = 1, .temperature_set = 19 }, |
| /* MacBook Pro 5,4: accelerometer, backlight and temperature set 20 */ |
| { .accelerometer = 1, .light = 1, .temperature_set = 20 }, |
| +/* MacBook Pro 6,2: accelerometer, backlight and temperature set 21 */ |
| + { .accelerometer = 1, .light = 1, .temperature_set = 21 }, |
| }; |
| |
| /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". |
| @@ -1392,6 +1398,10 @@ static __initdata struct dmi_system_id a |
| DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), |
| DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,3") }, |
| &applesmc_dmi_data[19]}, |
| + { applesmc_dmi_match, "Apple MacBook Pro 6", { |
| + DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), |
| + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro6") }, |
| + &applesmc_dmi_data[21]}, |
| { applesmc_dmi_match, "Apple MacBook Pro 5", { |
| DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), |
| DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") }, |
