public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* Re: [lm-sensors] [PATCH]BUG FIX: hwmon applesmc.c add iMac9, 1 and MacBookPro2, 2 to fix bug 14429
@ 2010-04-12 13:05 Henrik Rydberg
  0 siblings, 0 replies; 5+ messages in thread
From: Henrik Rydberg @ 2010-04-12 13:05 UTC (permalink / raw)
  To: linux-kernel@vger.kernel.org

I don't mind picking up maintenance of applesmc, I have practically been doing
it anyways for the last year or so.

Henrik



^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH]BUG FIX: hwmon applesmc.c add iMac9,1 and MacBookPro2,2 to fix bug 14429
@ 2010-04-11 21:43 Justin P. Mattock
  2010-04-12  7:45 ` [lm-sensors] [PATCH]BUG FIX: hwmon applesmc.c add iMac9, 1 and MacBookPro2, 2 " Jean Delvare
  0 siblings, 1 reply; 5+ messages in thread
From: Justin P. Mattock @ 2010-04-11 21:43 UTC (permalink / raw)
  To: linux-kernel; +Cc: lm-sensors, Justin P. Mattock

This patch adds the iMac9,1 and the MacBookPro2,2
temperature sensors to hwmon applesmc.c to fix bug entry: 
https://bugzilla.kernel.org/show_bug.cgi?id=14429

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
---
 drivers/hwmon/applesmc.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index c1605b5..5e762ac 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -142,6 +142,12 @@ static const char *temperature_sensors_sets[][41] = {
 	  "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", "TM8S", "TM9P", "TM9S",
 	  "TN0C", "TN0D", "TN0H", "TS0C", "Tp0C", "Tp1C", "Tv0S", "Tv1S",
 	  NULL },
+/* Set 17: iMac9,1 */
+	{ "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TH0P", "TL0P",
+	  "TN0D", "TN0H", "TN0P", "TO0P", "Tm0P", "Tp0P", NULL },
+/* Set 18: MacBookPro2,2 */
+	{ "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "TM0P", "TTF0",
+	  "Th0H", "Th1H", "Tm0P", "Ts0P", NULL },
 };
 
 /* List of keys used to read/write fan speeds */
@@ -1350,6 +1356,10 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
 	{ .accelerometer = 1, .light = 1, .temperature_set = 15 },
 /* MacPro3,1: temperature set 16 */
 	{ .accelerometer = 0, .light = 0, .temperature_set = 16 },
+/* iMac9,1: light sensor only, temperature set 17 */
+	{ .accelerometer = 0, .light = 0, .temperature_set = 17 },
+/* MacBookPro2,2: accelerometer, backlight and temperature set 18 */
+	{ .accelerometer = 1, .light = 1, .temperature_set = 18 },
 };
 
 /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1375,6 +1385,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
 	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
 	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3") },
 		&applesmc_dmi_data[9]},
+	{ applesmc_dmi_match, "Apple MacBookPro2,2", {
+	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple Computer, Inc."),
+	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro2,2") },
+		&applesmc_dmi_data[18]},
 	{ applesmc_dmi_match, "Apple MacBook Pro", {
 	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
 	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") },
@@ -1415,6 +1429,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
 	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
 	  DMI_MATCH(DMI_PRODUCT_NAME, "MacPro") },
 		&applesmc_dmi_data[4]},
+	{ applesmc_dmi_match, "Apple iMac9,1", {
+	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple Inc."),
+	  DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1") },
+		&applesmc_dmi_data[17]},
 	{ applesmc_dmi_match, "Apple iMac 8", {
 	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
 	  DMI_MATCH(DMI_PRODUCT_NAME, "iMac8") },
-- 
1.6.5.GIT


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2010-04-12 13:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-12 13:05 [lm-sensors] [PATCH]BUG FIX: hwmon applesmc.c add iMac9, 1 and MacBookPro2, 2 to fix bug 14429 Henrik Rydberg
  -- strict thread matches above, loose matches on Subject: below --
2010-04-11 21:43 [PATCH]BUG FIX: hwmon applesmc.c add iMac9,1 and MacBookPro2,2 " Justin P. Mattock
2010-04-12  7:45 ` [lm-sensors] [PATCH]BUG FIX: hwmon applesmc.c add iMac9, 1 and MacBookPro2, 2 " Jean Delvare
2010-04-12 12:37   ` Nicolas Boichat
2010-04-12 12:56     ` Jean Delvare
2010-04-12 13:26   ` Justin P. mattock

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox