diff options
| -rw-r--r-- | drivers/hwmon/applesmc.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index fd1281f42209..941729a131f5 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
| @@ -79,11 +79,15 @@ | |||
| 79 | 79 | ||
| 80 | /* | 80 | /* |
| 81 | * Temperature sensors keys (sp78 - 2 bytes). | 81 | * Temperature sensors keys (sp78 - 2 bytes). |
| 82 | * First set for Macbook(Pro), second for Macmini. | ||
| 83 | */ | 82 | */ |
| 84 | static const char* temperature_sensors_sets[][13] = { | 83 | static const char* temperature_sensors_sets[][13] = { |
| 84 | /* Set 0: Macbook Pro */ | ||
| 85 | { "TA0P", "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "Th0H", | 85 | { "TA0P", "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "Th0H", |
| 86 | "Th1H", "Tm0P", "Ts0P", "Ts1P", NULL }, | 86 | "Th1H", "Tm0P", "Ts0P", "Ts1P", NULL }, |
| 87 | /* Set 1: Macbook set */ | ||
| 88 | { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "Th0H", "Th0S", | ||
| 89 | "Th1H", "Ts0P", NULL }, | ||
| 90 | /* Set 2: Macmini set */ | ||
| 87 | { "TC0D", "TC0P", NULL } | 91 | { "TC0D", "TC0P", NULL } |
| 88 | }; | 92 | }; |
| 89 | 93 | ||
| @@ -1150,10 +1154,10 @@ static void applesmc_release_accelerometer(void) | |||
| 1150 | static __initdata struct dmi_match_data applesmc_dmi_data[] = { | 1154 | static __initdata struct dmi_match_data applesmc_dmi_data[] = { |
| 1151 | /* MacBook Pro: accelerometer, backlight and temperature set 0 */ | 1155 | /* MacBook Pro: accelerometer, backlight and temperature set 0 */ |
| 1152 | { .accelerometer = 1, .light = 1, .temperature_set = 0 }, | 1156 | { .accelerometer = 1, .light = 1, .temperature_set = 0 }, |
| 1153 | /* MacBook: accelerometer and temperature set 0 */ | 1157 | /* MacBook: accelerometer and temperature set 1 */ |
| 1154 | { .accelerometer = 1, .light = 0, .temperature_set = 0 }, | 1158 | { .accelerometer = 1, .light = 0, .temperature_set = 1 }, |
| 1155 | /* MacBook: temperature set 1 */ | 1159 | /* MacMini: temperature set 2 */ |
| 1156 | { .accelerometer = 0, .light = 0, .temperature_set = 1 } | 1160 | { .accelerometer = 0, .light = 0, .temperature_set = 2 }, |
| 1157 | }; | 1161 | }; |
| 1158 | 1162 | ||
| 1159 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". | 1163 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". |
