rpms/kernel/F-9 kernel.spec, 1.846, 1.847 linux-2.6.27-hwmon-applesmc-2.6.28.patch, 1.1, 1.2
Chuck Ebbert
cebbert at fedoraproject.org
Wed Nov 12 04:34:07 UTC 2008
- Previous message (by thread): rpms/xorg-x11-drv-i810/F-9 intel-2.3.2-cantiga.fix.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.101, 1.102
- Next message (by thread): rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.54, 1.55 drm-next.patch, 1.4, 1.5 kernel.spec, 1.1136, 1.1137
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22687
Modified Files:
kernel.spec linux-2.6.27-hwmon-applesmc-2.6.28.patch
Log Message:
applesmc: add support for iMac 5/8, MacBook 5, MacBook Pro 5
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.846
retrieving revision 1.847
diff -u -r1.846 -r1.847
--- kernel.spec 12 Nov 2008 00:00:07 -0000 1.846
+++ kernel.spec 12 Nov 2008 04:33:36 -0000 1.847
@@ -1887,7 +1887,10 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
-* Sun Nov 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-33
+* Wed Nov 12 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-34
+- applesmc: add support for iMac 5/8, MacBook 5, MacBook Pro 5
+
+* Tue Nov 11 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-33
- Check for more ATI timer routing bugs (#470587)
* Sun Nov 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-32
linux-2.6.27-hwmon-applesmc-2.6.28.patch:
Index: linux-2.6.27-hwmon-applesmc-2.6.28.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6.27-hwmon-applesmc-2.6.28.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.27-hwmon-applesmc-2.6.28.patch 30 Oct 2008 04:41:21 -0000 1.1
+++ linux-2.6.27-hwmon-applesmc-2.6.28.patch 12 Nov 2008 04:33:36 -0000 1.2
@@ -1,8 +1,7 @@
Rollup of applesmc updates from 2.6.28-rc
-diff -upr a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
--- a/drivers/hwmon/applesmc.c 2008-10-09 18:13:53.000000000 -0400
-+++ b/drivers/hwmon/applesmc.c 2008-10-20 17:36:24.000000000 -0400
++++ b/drivers/hwmon/applesmc.c 2008-11-10 13:45:01.000000000 -0500
@@ -49,6 +49,9 @@
#define APPLESMC_MAX_DATA_LENGTH 32
@@ -24,7 +23,7 @@
#define BACKLIGHT_KEY "LKSB" /* w-o {lkb (2 bytes) */
#define CLAMSHELL_KEY "MSLD" /* r-o ui8 (unused) */
-@@ -104,6 +107,15 @@ static const char* temperature_sensors_s
+@@ -104,6 +107,27 @@ static const char* temperature_sensors_s
/* Set 6: Macbook3 set */
{ "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TTF0", "TW0P", "Th0H",
"Th0S", "Th1H", NULL },
@@ -37,10 +36,22 @@
+/* Set 9: Macbook Pro 3,1 (Santa Rosa) */
+ { "TALP", "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P",
+ "Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL },
++/* Set 10: iMac 5,1 */
++ { "TA0P", "TC0D", "TC0P", "TG0D", "TH0P", "TO0P", "Tm0P", NULL },
++/* Set 11: Macbook 5,1 */
++ { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0P", "TN0D", "TN0P",
++ "TTF0", "Th0H", "Th1H", "ThFH", "Ts0P", "Ts0S", NULL },
++/* Set 12: Macbook Pro 5,1 */
++ { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TG0D",
++ "TG0F", "TG0H", "TG0P", "TG0T", "TG1H", "TN0D", "TN0P", "TTF0",
++ "Th2H", "Tm0P", "Ts0P", "Ts0S", NULL },
++/* Set 13: iMac 8,1 */
++ { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P",
++ "TL0P", "TO0P", "TW0P", "Tm0P", "Tp0P", NULL },
};
/* List of keys used to read/write fan speeds */
-@@ -163,25 +175,25 @@ static unsigned int key_at_index;
+@@ -163,25 +187,25 @@ static unsigned int key_at_index;
static struct workqueue_struct *applesmc_led_wq;
/*
@@ -72,7 +83,7 @@
}
printk(KERN_WARNING "applesmc: wait status failed: %x != %x\n",
-@@ -191,6 +203,25 @@ static int __wait_status(u8 val)
+@@ -191,6 +215,25 @@ static int __wait_status(u8 val)
}
/*
@@ -98,7 +109,7 @@
* applesmc_read_key - reads len bytes from a given key, and put them in buffer.
* Returns zero on success or a negative error on failure. Callers must
* hold applesmc_lock.
-@@ -205,8 +236,7 @@ static int applesmc_read_key(const char*
+@@ -205,8 +248,7 @@ static int applesmc_read_key(const char*
return -EINVAL;
}
@@ -108,7 +119,7 @@
return -EIO;
for (i = 0; i < 4; i++) {
-@@ -249,8 +279,7 @@ static int applesmc_write_key(const char
+@@ -249,8 +291,7 @@ static int applesmc_write_key(const char
return -EINVAL;
}
@@ -118,7 +129,7 @@
return -EIO;
for (i = 0; i < 4; i++) {
-@@ -284,8 +313,7 @@ static int applesmc_get_key_at_index(int
+@@ -284,8 +325,7 @@ static int applesmc_get_key_at_index(int
readkey[2] = index >> 8;
readkey[3] = index;
@@ -128,7 +139,7 @@
return -EIO;
for (i = 0; i < 4; i++) {
-@@ -315,8 +343,7 @@ static int applesmc_get_key_type(char* k
+@@ -315,8 +355,7 @@ static int applesmc_get_key_type(char* k
{
int i;
@@ -138,7 +149,7 @@
return -EIO;
for (i = 0; i < 4; i++) {
-@@ -325,7 +352,7 @@ static int applesmc_get_key_type(char* k
+@@ -325,7 +364,7 @@ static int applesmc_get_key_type(char* k
return -EIO;
}
@@ -147,7 +158,7 @@
for (i = 0; i < 6; i++) {
if (__wait_status(0x05))
-@@ -527,17 +554,27 @@ out:
+@@ -527,17 +566,27 @@ out:
static ssize_t applesmc_light_show(struct device *dev,
struct device_attribute *attr, char *sysfsbuf)
{
@@ -178,7 +189,7 @@
right = buffer[2];
out:
-@@ -1233,39 +1270,57 @@ static __initdata struct dmi_match_data
+@@ -1233,39 +1282,81 @@ 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 },
@@ -188,6 +199,14 @@
+ { .accelerometer = 1, .light = 1, .temperature_set = 8 },
+/* MacBook Pro 3: accelerometer, backlight and temperature set 9 */
+ { .accelerometer = 1, .light = 1, .temperature_set = 9 },
++/* iMac 5: light sensor only, temperature set 10 */
++ { .accelerometer = 0, .light = 0, .temperature_set = 10 },
++/* MacBook 5: accelerometer, backlight and temperature set 11 */
++ { .accelerometer = 1, .light = 1, .temperature_set = 11 },
++/* MacBook Pro 5: accelerometer, backlight and temperature set 12 */
++ { .accelerometer = 1, .light = 1, .temperature_set = 12 },
++/* iMac 8: light sensor only, temperature set 13 */
++ { .accelerometer = 0, .light = 0, .temperature_set = 13 },
};
/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -197,6 +216,10 @@
+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
+ &applesmc_dmi_data[7]},
++ { applesmc_dmi_match, "Apple MacBook Pro 5", {
++ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") },
++ &applesmc_dmi_data[12]},
+ { applesmc_dmi_match, "Apple MacBook Pro 4", {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") },
@@ -220,6 +243,10 @@
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") },
- (void*)&applesmc_dmi_data[6]},
+ &applesmc_dmi_data[6]},
++ { applesmc_dmi_match, "Apple MacBook 5", {
++ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5") },
++ &applesmc_dmi_data[11]},
{ applesmc_dmi_match, "Apple MacBook", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },
@@ -235,6 +262,14 @@
DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
- (void*)&applesmc_dmi_data[4]},
+ &applesmc_dmi_data[4]},
++ { applesmc_dmi_match, "Apple iMac 8", {
++ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "iMac8") },
++ &applesmc_dmi_data[13]},
++ { applesmc_dmi_match, "Apple iMac 5", {
++ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "iMac5") },
++ &applesmc_dmi_data[10]},
{ applesmc_dmi_match, "Apple iMac", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"iMac") },
- Previous message (by thread): rpms/xorg-x11-drv-i810/F-9 intel-2.3.2-cantiga.fix.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.101, 1.102
- Next message (by thread): rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.54, 1.55 drm-next.patch, 1.4, 1.5 kernel.spec, 1.1136, 1.1137
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list