[kernel] r16554 - in dists/sid/linux-2.6/debian: . patches/features/x86 patches/series
Ben Hutchings
benh at alioth.debian.org
Mon Nov 15 02:33:23 UTC 2010
Author: benh
Date: Mon Nov 15 02:33:13 2010
New Revision: 16554
Log:
[x86] applesmc: Add support for iMac 9,1 and MacBookPro 2,2, 5,3, 5,4, 6,* and 7,*
Added:
dists/sid/linux-2.6/debian/patches/features/x86/hwmon-applesmc-Add-generic-support-for-MacBook-Pro-6.patch
dists/sid/linux-2.6/debian/patches/features/x86/hwmon-applesmc-Add-generic-support-for-MacBook-Pro-7.patch
dists/sid/linux-2.6/debian/patches/features/x86/hwmon-applesmc-Add-iMac9-1-and-MacBookPro2-2-support.patch
dists/sid/linux-2.6/debian/patches/features/x86/hwmon-applesmc-Add-support-for-MacBook-Pro-5-3-and-5.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/series/28
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Mon Nov 15 02:26:47 2010 (r16553)
+++ dists/sid/linux-2.6/debian/changelog Mon Nov 15 02:33:13 2010 (r16554)
@@ -35,6 +35,8 @@
(Closes: #603419)
* [x86] snd-hda-codec-cirrus: Add quirks for IMac 27", MacBookPro 5,5 and 7,1
* [x86] btusb: Add device IDs for MacBookPro 6,2 and 7,1
+ * [x86] applesmc: Add support for iMac 9,1 and MacBookPro 2,2, 5,3, 5,4, 6,*
+ and 7,*
[ dann frazier ]
* [vserver] Update patch to 2.6.32.25-vs2.3.0.36.29.6
Added: dists/sid/linux-2.6/debian/patches/features/x86/hwmon-applesmc-Add-generic-support-for-MacBook-Pro-6.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/x86/hwmon-applesmc-Add-generic-support-for-MacBook-Pro-6.patch Mon Nov 15 02:33:13 2010 (r16554)
@@ -0,0 +1,55 @@
+From: Bernhard Froemel <froemel at vmars.tuwien.ac.at>
+Date: Thu, 27 May 2010 19:58:52 +0200
+Subject: [PATCH 5/7] hwmon: (applesmc) Add generic support for MacBook Pro 6
+
+commit 872bad55e2d3fcc13e1e8770a3b200f0c6ca5126 upstream.
+
+This patch adds generic support for the MacBook Pro 6 family
+based on the 6,2 model.
+
+[rydberg at euromail.se: patch cleanup]
+Signed-off-by: Bernhard Froemel <froemel at vmars.tuwien.ac.at>
+Signed-off-by: Henrik Rydberg <rydberg at euromail.se>
+Signed-off-by: Jean Delvare <khali at linux-fr.org>
+---
+ 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 be33094..ce41a43 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 */
+@@ -1374,6 +1378,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".
+@@ -1395,6 +1401,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.7.2.3
+
Added: dists/sid/linux-2.6/debian/patches/features/x86/hwmon-applesmc-Add-generic-support-for-MacBook-Pro-7.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/x86/hwmon-applesmc-Add-generic-support-for-MacBook-Pro-7.patch Mon Nov 15 02:33:13 2010 (r16554)
@@ -0,0 +1,52 @@
+From: Henrik Rydberg <rydberg at euromail.se>
+Date: Thu, 27 May 2010 19:58:53 +0200
+Subject: [PATCH 6/7] hwmon: (applesmc) Add generic support for MacBook Pro 7
+
+commit 405eaa1c1d045cdd872802fc515f638573984880 upstream.
+
+This patch adds generic support for the MacBook Pro 7 family
+based on the 7,1 model.
+
+Signed-off-by: Henrik Rydberg <rydberg at euromail.se>
+Signed-off-by: Jean Delvare <khali at linux-fr.org>
+---
+ 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 ce41a43..57c0331 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 */
+@@ -1380,6 +1383,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".
+@@ -1393,6 +1398,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.7.2.3
+
Added: dists/sid/linux-2.6/debian/patches/features/x86/hwmon-applesmc-Add-iMac9-1-and-MacBookPro2-2-support.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/x86/hwmon-applesmc-Add-iMac9-1-and-MacBookPro2-2-support.patch Mon Nov 15 02:33:13 2010 (r16554)
@@ -0,0 +1,70 @@
+From: Justin P. Mattock <justinmattock at gmail.com>
+Date: Wed, 14 Apr 2010 16:14:10 +0200
+Subject: [PATCH 2/7] hwmon: (applesmc) Add iMac9,1 and MacBookPro2,2 support
+
+commit e1741712e85cec8004c7eeeea81186618f78eff1 upstream.
+
+Add the iMac9,1 and the MacBookPro2,2 temperature sensors to hwmon
+driver applesmc to fix kernel bug #14429:
+https://bugzilla.kernel.org/show_bug.cgi?id=14429
+
+Signed-off-by: Justin P. Mattock <justinmattock at gmail.com>
+Acked-by: Nicolas Boichat <nicolas at boichat.ch>
+Signed-off-by: Jean Delvare <khali at linux-fr.org>
+---
+ 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..0f28d91 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: iMac 9,1 */
++ { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TH0P", "TL0P",
++ "TN0D", "TN0H", "TN0P", "TO0P", "Tm0P", "Tp0P", NULL },
++/* Set 18: MacBook Pro 2,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 },
++/* iMac 9,1: light sensor only, temperature set 17 */
++ { .accelerometer = 0, .light = 0, .temperature_set = 17 },
++/* MacBook Pro 2,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 MacBook Pro 2,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 iMac 9,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.7.2.3
+
Added: dists/sid/linux-2.6/debian/patches/features/x86/hwmon-applesmc-Add-support-for-MacBook-Pro-5-3-and-5.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/x86/hwmon-applesmc-Add-support-for-MacBook-Pro-5-3-and-5.patch Mon Nov 15 02:33:13 2010 (r16554)
@@ -0,0 +1,62 @@
+From: Henrik Rydberg <rydberg at euromail.se>
+Date: Thu, 27 May 2010 19:58:50 +0200
+Subject: [PATCH 4/7] hwmon: (applesmc) Add support for MacBook Pro 5,3 and 5,4
+
+commit 4e4a99d32721800c061191027f18f780dcbd9e0b upstream.
+
+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 at euromail.se>
+Signed-off-by: Jean Delvare <khali at linux-fr.org>
+---
+ 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 f085c18..be33094 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 */
+@@ -1363,6 +1370,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".
+@@ -1376,6 +1387,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.7.2.3
+
Modified: dists/sid/linux-2.6/debian/patches/series/28
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/28 Mon Nov 15 02:26:47 2010 (r16553)
+++ dists/sid/linux-2.6/debian/patches/series/28 Mon Nov 15 02:33:13 2010 (r16554)
@@ -24,3 +24,7 @@
+ features/x86/ALSA-hda-Add-model-mbp55-entry-for-MacBookPro-7-1.patch
+ features/x86/Bluetooth-Add-support-for-MacbookPro-6-2.patch
+ features/x86/Bluetooth-Add-support-for-MacbookPro-7-1.patch
++ features/x86/hwmon-applesmc-Add-iMac9-1-and-MacBookPro2-2-support.patch
++ features/x86/hwmon-applesmc-Add-support-for-MacBook-Pro-5-3-and-5.patch
++ features/x86/hwmon-applesmc-Add-generic-support-for-MacBook-Pro-6.patch
++ features/x86/hwmon-applesmc-Add-generic-support-for-MacBook-Pro-7.patch
More information about the Kernel-svn-changes
mailing list