rpms/kernel/F-9 kernel.spec, 1.864, 1.865 linux-2.6.27-hwmon-applesmc-2.6.28.patch, 1.2, 1.3

Chuck Ebbert cebbert at fedoraproject.org
Thu Nov 27 04:39:38 UTC 2008


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11574

Modified Files:
	kernel.spec linux-2.6.27-hwmon-applesmc-2.6.28.patch 
Log Message:
applesmc: add support for Macbook 4 / iMac 6 / generic MacPro


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.864
retrieving revision 1.865
diff -u -r1.864 -r1.865
--- kernel.spec	25 Nov 2008 16:29:59 -0000	1.864
+++ kernel.spec	27 Nov 2008 04:39:06 -0000	1.865
@@ -1901,6 +1901,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Nov 26 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.7-52
+- applesmc: add support for Macbook 4 / iMac 6 / generic MacPro
+
 * Tue Nov 25 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.7-51
 - Fix Zepto notebook multimedia keys (#460237)
 - Fix Dell XPS 1530 trackpad (#448656)

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.27-hwmon-applesmc-2.6.28.patch	12 Nov 2008 04:33:36 -0000	1.2
+++ linux-2.6.27-hwmon-applesmc-2.6.28.patch	27 Nov 2008 04:39:06 -0000	1.3
@@ -1,7 +1,7 @@
-Rollup of applesmc updates from 2.6.28-rc
+Update applesmc to 2.6.28-rc6-git1
 
 --- a/drivers/hwmon/applesmc.c	2008-10-09 18:13:53.000000000 -0400
-+++ b/drivers/hwmon/applesmc.c	2008-11-10 13:45:01.000000000 -0500
++++ b/drivers/hwmon/applesmc.c	2008-11-25 09:54:55.000000000 -0500
 @@ -49,6 +49,9 @@
  
  #define APPLESMC_MAX_DATA_LENGTH 32
@@ -23,7 +23,7 @@
  #define BACKLIGHT_KEY		"LKSB" /* w-o {lkb (2 bytes) */
  
  #define CLAMSHELL_KEY		"MSLD" /* r-o ui8 (unused) */
-@@ -104,6 +107,27 @@ static const char* temperature_sensors_s
+@@ -104,6 +107,30 @@ static const char* temperature_sensors_s
  /* Set 6: Macbook3 set */
  	{ "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TTF0", "TW0P", "Th0H",
  	  "Th0S", "Th1H", NULL },
@@ -48,10 +48,13 @@
 +/* Set 13: iMac 8,1 */
 +	{ "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P",
 +	  "TL0P", "TO0P", "TW0P", "Tm0P", "Tp0P", NULL },
++/* Set 14: iMac 6,1 */
++	{ "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P",
++	  "TO0P", "Tp0P", NULL },
  };
  
  /* List of keys used to read/write fan speeds */
-@@ -163,25 +187,25 @@ static unsigned int key_at_index;
+@@ -163,25 +190,25 @@ static unsigned int key_at_index;
  static struct workqueue_struct *applesmc_led_wq;
  
  /*
@@ -83,7 +86,7 @@
  	}
  
  	printk(KERN_WARNING "applesmc: wait status failed: %x != %x\n",
-@@ -191,6 +215,25 @@ static int __wait_status(u8 val)
+@@ -191,6 +218,25 @@ static int __wait_status(u8 val)
  }
  
  /*
@@ -109,7 +112,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 +248,7 @@ static int applesmc_read_key(const char*
+@@ -205,8 +251,7 @@ static int applesmc_read_key(const char*
  		return -EINVAL;
  	}
  
@@ -119,7 +122,7 @@
  		return -EIO;
  
  	for (i = 0; i < 4; i++) {
-@@ -249,8 +291,7 @@ static int applesmc_write_key(const char
+@@ -249,8 +294,7 @@ static int applesmc_write_key(const char
  		return -EINVAL;
  	}
  
@@ -129,7 +132,7 @@
  		return -EIO;
  
  	for (i = 0; i < 4; i++) {
-@@ -284,8 +325,7 @@ static int applesmc_get_key_at_index(int
+@@ -284,8 +328,7 @@ static int applesmc_get_key_at_index(int
  	readkey[2] = index >> 8;
  	readkey[3] = index;
  
@@ -139,7 +142,7 @@
  		return -EIO;
  
  	for (i = 0; i < 4; i++) {
-@@ -315,8 +355,7 @@ static int applesmc_get_key_type(char* k
+@@ -315,8 +358,7 @@ static int applesmc_get_key_type(char* k
  {
  	int i;
  
@@ -149,7 +152,7 @@
  		return -EIO;
  
  	for (i = 0; i < 4; i++) {
-@@ -325,7 +364,7 @@ static int applesmc_get_key_type(char* k
+@@ -325,7 +367,7 @@ static int applesmc_get_key_type(char* k
  			return -EIO;
  	}
  
@@ -158,7 +161,7 @@
  
  	for (i = 0; i < 6; i++) {
  		if (__wait_status(0x05))
-@@ -527,17 +566,27 @@ out:
+@@ -527,17 +569,27 @@ out:
  static ssize_t applesmc_light_show(struct device *dev,
  				struct device_attribute *attr, char *sysfsbuf)
  {
@@ -189,9 +192,12 @@
  	right = buffer[2];
  
  out:
-@@ -1233,39 +1282,81 @@ static __initdata struct dmi_match_data 
+@@ -1231,41 +1283,97 @@ static __initdata struct dmi_match_data 
+ 	{ .accelerometer = 0, .light = 0, .temperature_set = 4 },
+ /* iMac: temperature set 5 */
  	{ .accelerometer = 0, .light = 0, .temperature_set = 5 },
- /* MacBook3: accelerometer and temperature set 6 */
+-/* MacBook3: accelerometer and temperature set 6 */
++/* MacBook3, MacBook4: 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 },
@@ -207,6 +213,8 @@
 +	{ .accelerometer = 1, .light = 1, .temperature_set = 12 },
 +/* iMac 8: light sensor only, temperature set 13 */
 +	{ .accelerometer = 0, .light = 0, .temperature_set = 13 },
++/* iMac 6: light sensor only, temperature set 14 */
++	{ .accelerometer = 0, .light = 0, .temperature_set = 14 },
  };
  
  /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -243,6 +251,10 @@
  	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") },
 -		(void*)&applesmc_dmi_data[6]},
 +		&applesmc_dmi_data[6]},
++	{ applesmc_dmi_match, "Apple MacBook 4", {
++	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
++	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBook4") },
++		&applesmc_dmi_data[6]},
 +	{ applesmc_dmi_match, "Apple MacBook 5", {
 +	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
 +	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5") },
@@ -262,10 +274,18 @@
  	  DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
 -		(void*)&applesmc_dmi_data[4]},
 +		&applesmc_dmi_data[4]},
++	{ applesmc_dmi_match, "Apple MacPro", {
++	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
++	  DMI_MATCH(DMI_PRODUCT_NAME, "MacPro") },
++		&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 6", {
++	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
++	  DMI_MATCH(DMI_PRODUCT_NAME, "iMac6") },
++		&applesmc_dmi_data[14]},
 +	{ applesmc_dmi_match, "Apple iMac 5", {
 +	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
 +	  DMI_MATCH(DMI_PRODUCT_NAME, "iMac5") },




More information about the fedora-extras-commits mailing list