From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + hwmon-applesmc-add-support-for-macbook-air.patch added to -mm tree Date: Fri, 19 Sep 2008 15:55:43 -0700 Message-ID: <200809192255.m8JMthkZ010710@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:34922 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751984AbYISWz6 (ORCPT ); Fri, 19 Sep 2008 18:55:58 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: rydberg@euromail.se, khali@linux-fr.org, mhoffman@lightlink.com, nicolas@boichat.ch, rkoktarianto@gmail.com The patch titled hwmon: applesmc: add support for Macbook Air has been added to the -mm tree. Its filename is hwmon-applesmc-add-support-for-macbook-air.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: hwmon: applesmc: add support for Macbook Air From: Henrik Rydberg This patch adds accelerometer, backlight and temperature sensor support for the Macbook Air. Signed-off-by: Henrik Rydberg Cc: Nicolas Boichat Cc: Riki Oktarianto Cc: Mark M. Hoffman Cc: Jean Delvare Signed-off-by: Andrew Morton --- drivers/hwmon/applesmc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff -puN drivers/hwmon/applesmc.c~hwmon-applesmc-add-support-for-macbook-air drivers/hwmon/applesmc.c --- a/drivers/hwmon/applesmc.c~hwmon-applesmc-add-support-for-macbook-air +++ a/drivers/hwmon/applesmc.c @@ -104,6 +104,9 @@ static const char* temperature_sensors_s /* Set 6: Macbook3 set */ { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TTF0", "TW0P", "Th0H", "Th0S", "Th1H", NULL }, +/* Set 7: Macbook Air */ + { "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TC0P", "TCFP", + "TTF0", "TW0P", "Th0H", "Tp0P", "TpFP", "Ts0P", "Ts0S", NULL }, }; /* List of keys used to read/write fan speeds */ @@ -1259,11 +1262,17 @@ static __initdata struct dmi_match_data { .accelerometer = 0, .light = 0, .temperature_set = 5 }, /* MacBook3: accelerometer and temperature set 6 */ { .accelerometer = 1, .light = 0, .temperature_set = 6 }, +/* MacBook Air: accelerometer, backlight and temperature set 7 */ + { .accelerometer = 1, .light = 1, .temperature_set = 7 }, }; /* 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") }, + (void*)&applesmc_dmi_data[7]}, { applesmc_dmi_match, "Apple MacBook Pro", { DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") }, _ Patches currently in -mm which might be from rydberg@euromail.se are linux-next.patch input-mousedev-distinguish-a-moving-finger-from-a-tapping-finger.patch hwmon-applesmc-specified-number-of-bytes-to-read-should-match-actual.patch hwmon-applesmc-fix-the-wait-status-failed-c-=-8-problem.patch hwmon-applesmc-prolong-status-wait.patch hwmon-applesmc-allow-for-variable-alv0-and-alv1-package-length.patch hwmon-applesmc-add-support-for-macbook-air.patch