hwmon: applesmc: Add support for Macbook Pro 3
Subsystems (2)
PATCH 1/1 hwmon: applesmc: Add support for Macbook Pro 3
This patch adds temperature sensor support for Macbook Pro 3.
--- drivers/hwmon/applesmc.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
drivers/hwmon/applesmc.c +9 -0
@@ -110,6 +110,9 @@ static const char* temperature_sensors_sets[][36] = {/* Set 8: Macbook Pro 4,1 (Penryn) */ {"TB0T" ,"TC0D" ,"TC0P" ,"TG0D" ,"TG0H" ,"TTF0" ,"TW0P" ,"Th0H" , "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, +/* Set 9: Macbook Pro 3,1 (Santa Rosa) */ + { "TALP", "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", + "Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, };/* List of keys used to read/write fan speeds */
@@ -1269,6 +1272,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { { .accelerometer = 1, .light = 1, .temperature_set = 7 }, /* MacBook Pro 4: accelerometer, backlight and temperature set 8 */ { .accelerometer = 1, .light = 1, .temperature_set = 8 }, +/* MacBook Pro 3: accelerometer, backlight and temperature set 9 */ + { .accelerometer = 1, .light = 1, .temperature_set = 9 }, };/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1278,6 +1283,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {DMI_MATCH (DMI_BOARD_VENDOR ,"Apple" ), DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, (void*)&applesmc_dmi_data[7]}, + { applesmc_dmi_match, "Apple MacBook Pro 3", { +DMI_MATCH (DMI_BOARD_VENDOR ,"Apple" ), + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3") }, + &applesmc_dmi_data[9]}, { applesmc_dmi_match, "Apple MacBook Pro 4", {DMI_MATCH (DMI_BOARD_VENDOR ,"Apple" ), DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") },
Signature · 7 lines
1.5.6.3 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 1 line · On Tue, 23 Sep 2008 19:30:27 +0200 Henrik Rydberg <[email protected]> wrote:
This patch adds temperature sensor support for Macbook Pro 3.
For some reason I keep on having to fix rejects in applesmc_whitelist[].
Here's what I now have:
/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
* So we need to put "Apple MacBook Pro" before "Apple MacBook". */
static __initdata struct dmi_system_id applesmc_whitelist[] = {
{ applesmc_dmi_match, "Apple MacBook Air", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
&applesmc_dmi_data[7]},
{ applesmc_dmi_match, "Apple MacBook Pro 4", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") },
&applesmc_dmi_data[8]},
{ applesmc_dmi_match, "Apple MacBook Pro 3", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3") },
&applesmc_dmi_data[9]},
{ applesmc_dmi_match, "Apple MacBook Pro", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") },
&applesmc_dmi_data[0]},
{ applesmc_dmi_match, "Apple MacBook (v2)", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook2") },
&applesmc_dmi_data[1]},
{ applesmc_dmi_match, "Apple MacBook (v3)", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") },
&applesmc_dmi_data[6]},
{ applesmc_dmi_match, "Apple MacBook", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },
&applesmc_dmi_data[2]},
{ applesmc_dmi_match, "Apple Macmini", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"Macmini") },
&applesmc_dmi_data[3]},
{ applesmc_dmi_match, "Apple MacPro2", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
&applesmc_dmi_data[4]},
{ applesmc_dmi_match, "Apple iMac", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"iMac") },
&applesmc_dmi_data[5]},
{ .ident = NULL }
};From my reading, we're still OK wrt the prefix-based string matching. But please do double-chck this.
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 8 lines · Andrew Morton
Quoted 1 line · On Tue, 23 Sep 2008 19:30:27 +0200 Henrik Rydberg <[email protected]> wrote:
This patch adds temperature sensor support for Macbook Pro 3.
For some reason I keep on having to fix rejects in applesmc_whitelist[].
I have also experienced that problem. Odd. Please see my comment below.
Thanks,
Henrik
-----
Quoted 4 lines
Here's what I now have:
/* Note that
DMI_MATCH(...,"MacBook")will match "MacBookPro1,1".
* So we need to put "Apple MacBook Pro" before "Apple MacBook". */
Quoted 13 lines
static __initdata struct dmi_system_id applesmc_whitelist[] = {
{ applesmc_dmi_match, "Apple MacBook Air", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
&applesmc_dmi_data[7]},
{ applesmc_dmi_match, "Apple MacBook Pro 4", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") },
&applesmc_dmi_data[8]},
{ applesmc_dmi_match, "Apple MacBook Pro 3", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3") },
&applesmc_dmi_data[9]},The two entries above are in reversed order in my tree, but as you say, it does not matter.
Quoted 31 lines
{ applesmc_dmi_match, "Apple MacBook Pro", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") },
&applesmc_dmi_data[0]},
{ applesmc_dmi_match, "Apple MacBook (v2)", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook2") },
&applesmc_dmi_data[1]},
{ applesmc_dmi_match, "Apple MacBook (v3)", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") },
&applesmc_dmi_data[6]},
{ applesmc_dmi_match, "Apple MacBook", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },
&applesmc_dmi_data[2]},
{ applesmc_dmi_match, "Apple Macmini", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"Macmini") },
&applesmc_dmi_data[3]},
{ applesmc_dmi_match, "Apple MacPro2", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
&applesmc_dmi_data[4]},
{ applesmc_dmi_match, "Apple iMac", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"iMac") },
&applesmc_dmi_data[5]},
{ .ident = NULL }
};Quoted 3 lines
From my reading, we're still OK wrt the prefix-based string matching. But please do double-chck this.
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors