Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758898AbYG2PJV (ORCPT ); Tue, 29 Jul 2008 11:09:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751676AbYG2PJM (ORCPT ); Tue, 29 Jul 2008 11:09:12 -0400 Received: from 42.mail-out.ovh.net ([213.251.189.42]:55451 "HELO 42.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751542AbYG2PJL (ORCPT ); Tue, 29 Jul 2008 11:09:11 -0400 Message-ID: <488F30F7.4030804@boichat.ch> Date: Tue, 29 Jul 2008 23:02:15 +0800 From: Nicolas Boichat User-Agent: Thunderbird 2.0.0.14 (X11/20080625) MIME-Version: 1.0 To: "Mark M. Hoffman" CC: roberto@unbit.it, mactel-linux-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Jean Delvare , LM Sensors , Andrew Morton Subject: [PATCH 1/2] Support for Intel iMac in applesmc References: <1216814135.5834.9.camel@sirius> In-Reply-To: <1216814135.5834.9.camel@sirius> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Ovh-Tracer-Id: 3530822108091972769 X-Ovh-Remote: 220.255.224.226 (bb220-255-224-226.singnet.com.sg) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-Spam-Check: DONE|H 0.5/N Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2494 Lines: 78 Hi all, Roberto De Ioris wrote: > Hi all, this patch (2.6.26 vanilla) add supports for fans and > temperature sensors on intel iMac. > > Tested on iMac 24" 2.8ghz (iMac8,1), it supports the following sensors: > Here is a slightly modified version (Andrew realigned the sensors list). Mark: If the MAINTAINERS file is correct, it should go in your git tree, right? Thanks. This patch (2.6.26 vanilla) adds support for fans and temperature sensors on Intel iMac. Tested on iMac 24" 2.8ghz (iMac8,1), it supports the following sensors: cpu A ambient gpu gpu diode gpu heatsink hd bay 1 memory controller optical drive power Signed-off-by: Roberto De Ioris Signed-off-by: Nicolas Boichat Signed-off-by: Andrew Morton --- 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 aacc0c4..52d842b 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c @@ -98,6 +98,9 @@ static const char* temperature_sensors_sets[][36] = { "TH1P", "TH2P", "TH3P", "TMAP", "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", NULL }, +/* Set 5: iMac */ + { "TC0D", "TA0P", "TG0P", "TG0D", "TG0H", "TH0P", "Tm0P", "TO0P", + "Tp0C", NULL }, }; /* List of keys used to read/write fan speeds */ @@ -1223,6 +1226,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { { .accelerometer = 0, .light = 0, .temperature_set = 3 }, /* MacPro: temperature set 4 */ { .accelerometer = 0, .light = 0, .temperature_set = 4 }, +/* iMac: temperature set 5 */ + { .accelerometer = 0, .light = 0, .temperature_set = 5 }, }; /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". @@ -1248,6 +1253,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = { DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") }, (void*)&applesmc_dmi_data[4]}, + { applesmc_dmi_match, "Apple iMac", { + DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), + DMI_MATCH(DMI_PRODUCT_NAME,"iMac") }, + (void*)&applesmc_dmi_data[5]}, { .ident = NULL } }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/