* [PATCH 1/3] hwmon: applesmc: Add support for MacBook Pro 5,3 and 5,4
@ 2010-04-30 21:38 Henrik Rydberg
2010-04-30 21:38 ` [PATCH 2/3] hwmon: applesmc: Add generic support for MacBook Pro 6 Henrik Rydberg
0 siblings, 1 reply; 5+ messages in thread
From: Henrik Rydberg @ 2010-04-30 21:38 UTC (permalink / raw)
To: Jean Delvare; +Cc: lm-sensors, linux-kernel, Henrik Rydberg
The MacBookPro 5,3 model has two fans, whereas the 5,4 model has
only one. This patch adds explicit support for the 5,3 and 5,4 models.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
---
drivers/hwmon/applesmc.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 0f28d91..67626c1 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -148,6 +148,13 @@ static const char *temperature_sensors_sets[][41] = {
/* Set 18: MacBook Pro 2,2 */
{ "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "TM0P", "TTF0",
"Th0H", "Th1H", "Tm0P", "Ts0P", NULL },
+/* Set 19: Macbook Pro 5,3 */
+ { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TG0D",
+ "TG0F", "TG0H", "TG0P", "TG0T", "TN0D", "TN0P", "TTF0", "Th2H",
+ "Tm0P", "Ts0P", "Ts0S", NULL },
+/* Set 20: MacBook Pro 5,4 */
+ { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TN0D",
+ "TN0P", "TTF0", "Th2H", "Ts0P", "Ts0S", NULL },
};
/* List of keys used to read/write fan speeds */
@@ -1360,6 +1367,10 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
{ .accelerometer = 0, .light = 0, .temperature_set = 17 },
/* MacBook Pro 2,2: accelerometer, backlight and temperature set 18 */
{ .accelerometer = 1, .light = 1, .temperature_set = 18 },
+/* MacBook Pro 5,3: accelerometer, backlight and temperature set 19 */
+ { .accelerometer = 1, .light = 1, .temperature_set = 19 },
+/* MacBook Pro 5,4: accelerometer, backlight and temperature set 20 */
+ { .accelerometer = 1, .light = 1, .temperature_set = 20 },
};
/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1373,6 +1384,14 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
&applesmc_dmi_data[7]},
+ { applesmc_dmi_match, "Apple MacBook Pro 5,4", {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,4") },
+ &applesmc_dmi_data[20]},
+ { applesmc_dmi_match, "Apple MacBook Pro 5,3", {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,3") },
+ &applesmc_dmi_data[19]},
{ applesmc_dmi_match, "Apple MacBook Pro 5", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") },
--
1.6.3.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] hwmon: applesmc: Add generic support for MacBook Pro 6
2010-04-30 21:38 [PATCH 1/3] hwmon: applesmc: Add support for MacBook Pro 5,3 and 5,4 Henrik Rydberg
@ 2010-04-30 21:38 ` Henrik Rydberg
2010-04-30 21:38 ` [PATCH 3/3] hwmon: applesmc: Add generic support for MacBook Pro 7 Henrik Rydberg
0 siblings, 1 reply; 5+ messages in thread
From: Henrik Rydberg @ 2010-04-30 21:38 UTC (permalink / raw)
To: Jean Delvare; +Cc: lm-sensors, linux-kernel, Bernhard Froemel, Henrik Rydberg
From: Bernhard Froemel <froemel@vmars.tuwien.ac.at>
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>
---
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 67626c1..2ea6e67 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -155,6 +155,10 @@ static const char *temperature_sensors_sets[][41] = {
/* 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 applesmc_dmi_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 applesmc_whitelist[] = {
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") },
--
1.6.3.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] hwmon: applesmc: Add generic support for MacBook Pro 7
2010-04-30 21:38 ` [PATCH 2/3] hwmon: applesmc: Add generic support for MacBook Pro 6 Henrik Rydberg
@ 2010-04-30 21:38 ` Henrik Rydberg
2010-05-01 18:40 ` Jean Delvare
0 siblings, 1 reply; 5+ messages in thread
From: Henrik Rydberg @ 2010-04-30 21:38 UTC (permalink / raw)
To: Jean Delvare; +Cc: lm-sensors, linux-kernel, Henrik Rydberg
This patch adds generic support for the MacBook Pro 7 family
based on the 7,1 model.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
---
drivers/hwmon/applesmc.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 2ea6e67..36a0d62 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -159,6 +159,9 @@ static const char *temperature_sensors_sets[][41] = {
{ "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", "TC0P", "TC1C", "TG0D",
"TG0P", "TG0T", "TMCD", "TP0P", "TPCD", "Th1H", "Th2H", "Tm0P",
"Ts0P", "Ts0S", NULL },
+/* Set 22: MacBook Pro 7,1 */
+ { "TB0T", "TB1T", "TB2T", "TC0D", "TC0P", "TN0D", "TN0P", "TN0S",
+ "TN1D", "TN1F", "TN1G", "TN1S", "Th1H", "Ts0P", "Ts0S", NULL },
};
/* List of keys used to read/write fan speeds */
@@ -1377,6 +1380,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
{ .accelerometer = 1, .light = 1, .temperature_set = 20 },
/* MacBook Pro 6,2: accelerometer, backlight and temperature set 21 */
{ .accelerometer = 1, .light = 1, .temperature_set = 21 },
+/* MacBook Pro 7,1: accelerometer, backlight and temperature set 22 */
+ { .accelerometer = 1, .light = 1, .temperature_set = 22 },
};
/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1390,6 +1395,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
&applesmc_dmi_data[7]},
+ { applesmc_dmi_match, "Apple MacBook Pro 7", {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro7") },
+ &applesmc_dmi_data[22]},
{ applesmc_dmi_match, "Apple MacBook Pro 5,4", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,4") },
--
1.6.3.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 3/3] hwmon: applesmc: Add generic support for MacBook Pro 7
2010-04-30 21:38 ` [PATCH 3/3] hwmon: applesmc: Add generic support for MacBook Pro 7 Henrik Rydberg
@ 2010-05-01 18:40 ` Jean Delvare
2010-05-01 18:43 ` Henrik Rydberg
0 siblings, 1 reply; 5+ messages in thread
From: Jean Delvare @ 2010-05-01 18:40 UTC (permalink / raw)
To: Henrik Rydberg; +Cc: lm-sensors, linux-kernel
Hi Henrik,
On Fri, 30 Apr 2010 23:38:06 +0200, Henrik Rydberg wrote:
> This patch adds generic support for the MacBook Pro 7 family
> based on the 7,1 model.
>
> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
> ---
> drivers/hwmon/applesmc.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
> (...)
All 3 patches applied. I guess they can be scheduled for merge in
2.6.35-rc1?
--
Jean Delvare
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] hwmon: applesmc: Add generic support for MacBook Pro 7
2010-05-01 18:40 ` Jean Delvare
@ 2010-05-01 18:43 ` Henrik Rydberg
0 siblings, 0 replies; 5+ messages in thread
From: Henrik Rydberg @ 2010-05-01 18:43 UTC (permalink / raw)
To: Jean Delvare; +Cc: lm-sensors, linux-kernel
Jean Delvare wrote:
> Hi Henrik,
>
> On Fri, 30 Apr 2010 23:38:06 +0200, Henrik Rydberg wrote:
>> This patch adds generic support for the MacBook Pro 7 family
>> based on the 7,1 model.
>>
>> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
>> ---
>> drivers/hwmon/applesmc.c | 9 +++++++++
>> 1 files changed, 9 insertions(+), 0 deletions(-)
>> (...)
>
> All 3 patches applied. I guess they can be scheduled for merge in
> 2.6.35-rc1?
>
Yep, 2.6.35-rc1 is just fine. Thanks!
Henrik
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-05-01 18:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-30 21:38 [PATCH 1/3] hwmon: applesmc: Add support for MacBook Pro 5,3 and 5,4 Henrik Rydberg
2010-04-30 21:38 ` [PATCH 2/3] hwmon: applesmc: Add generic support for MacBook Pro 6 Henrik Rydberg
2010-04-30 21:38 ` [PATCH 3/3] hwmon: applesmc: Add generic support for MacBook Pro 7 Henrik Rydberg
2010-05-01 18:40 ` Jean Delvare
2010-05-01 18:43 ` Henrik Rydberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox