.32 patches

3 files changed, 118 insertions, 0 deletions

diff --git a/queue-2.6.32/hid-usbhid-add-support-for-sigma-micro-chip.patch b/queue-2.6.32/hid-usbhid-add-support-for-sigma-micro-chip.patch
new file mode 100644
index 0000000..041b336
--- /dev/null
+++ b/queue-2.6.32/hid-usbhid-add-support-for-sigma-micro-chip.patch
@@ -0,0 +1,49 @@
+From f5e4282586dc0c9dab8c7d32e6c43aa07f68586b Mon Sep 17 00:00:00 2001
+From: Jeremiah Matthey <sprg86@gmail.com>
+Date: Tue, 23 Aug 2011 09:44:30 +0200
+Subject: HID: usbhid: Add support for SiGma Micro chip
+
+From: Jeremiah Matthey <sprg86@gmail.com>
+
+commit f5e4282586dc0c9dab8c7d32e6c43aa07f68586b upstream.
+
+Patch to add SiGma Micro-based keyboards (1c4f:0002) to hid-quirks.
+
+These keyboards dont seem to allow the records to be initialized, and hence a
+timeout occurs when the usbhid driver attempts to initialize them. The patch
+just adds the signature for these keyboards to the hid-quirks list with the
+setting HID_QUIRK_NO_INIT_REPORTS. This removes the 5-10 second wait for the
+timeout to occur.
+
+Signed-off-by: Jeremiah Matthey <sprg86@gmail.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/hid/hid-ids.h           |    3 +++
+ drivers/hid/usbhid/hid-quirks.c |    1 +
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -389,6 +389,9 @@
+ #define USB_VENDOR_ID_SAMSUNG		0x0419
+ #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001
+ 
++#define USB_VENDOR_ID_SIGMA_MICRO	0x1c4f
++#define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD	0x0002
++
+ #define USB_VENDOR_ID_SONY			0x054c
+ #define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE	0x024b
+ #define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268
+--- a/drivers/hid/usbhid/hid-quirks.c
++++ b/drivers/hid/usbhid/hid-quirks.c
+@@ -65,6 +65,7 @@ static const struct hid_blacklist {
+ 	{ USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
+ 	{ USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
+ 
++	{ USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD, HID_QUIRK_NO_INIT_REPORTS },
+ 	{ 0, 0 }
+ };
+ 
diff --git a/queue-2.6.32/hwmon-w83627ehf-properly-report-thermal-diode-sensors.patch b/queue-2.6.32/hwmon-w83627ehf-properly-report-thermal-diode-sensors.patch
new file mode 100644
index 0000000..3b6a506
--- /dev/null
+++ b/queue-2.6.32/hwmon-w83627ehf-properly-report-thermal-diode-sensors.patch
@@ -0,0 +1,67 @@
+From bf164c58e58328c40ebc597a8ac00cc6840f9703 Mon Sep 17 00:00:00 2001
+From: Jean Delvare <khali@linux-fr.org>
+Date: Thu, 13 Oct 2011 15:49:08 -0400
+Subject: hwmon: (w83627ehf) Properly report thermal diode sensors
+
+From: Jean Delvare <khali@linux-fr.org>
+
+commit bf164c58e58328c40ebc597a8ac00cc6840f9703 upstream.
+
+The w83627ehf driver is improperly reporting thermal diode sensors as
+type 2, instead of 3. This caused "sensors" and possibly other
+monitoring tools to report these sensors as "transistor" instead of
+"thermal diode".
+
+Furthermore, diode subtype selection (CPU vs. external) is only
+supported by the original W83627EHF/EHG. All later models only support
+CPU diode type, and some (NCT6776F) don't even have the register in
+question so we should avoid reading from it.
+
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/hwmon/w83627ehf.c |   15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+--- a/drivers/hwmon/w83627ehf.c
++++ b/drivers/hwmon/w83627ehf.c
+@@ -1239,7 +1239,8 @@ static void w83627ehf_device_remove_file
+ }
+ 
+ /* Get the monitoring functions started */
+-static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data)
++static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,
++						   enum kinds kind)
+ {
+ 	int i;
+ 	u8 tmp, diode;
+@@ -1268,10 +1269,16 @@ static inline void __devinit w83627ehf_i
+ 		w83627ehf_write_value(data, W83627EHF_REG_VBAT, tmp | 0x01);
+ 
+ 	/* Get thermal sensor types */
+-	diode = w83627ehf_read_value(data, W83627EHF_REG_DIODE);
++	switch (kind) {
++	case w83627ehf:
++		diode = w83627ehf_read_value(data, W83627EHF_REG_DIODE);
++		break;
++	default:
++		diode = 0x70;
++	}
+ 	for (i = 0; i < 3; i++) {
+ 		if ((tmp & (0x02 << i)))
+-			data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 2;
++			data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3;
+ 		else
+ 			data->temp_type[i] = 4; /* thermistor */
+ 	}
+@@ -1319,7 +1326,7 @@ static int __devinit w83627ehf_probe(str
+ 	}
+ 
+ 	/* Initialize the chip */
+-	w83627ehf_init_device(data);
++	w83627ehf_init_device(data, sio_data->kind);
+ 
+ 	data->vrm = vid_which_vrm();
+ 	superio_enter(sio_data->sioreg);
diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index 7805c7b..b4618be 100644
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -44,3 +44,5 @@ cfg80211-fix-validation-of-akm-suites.patch
 splice-direct_splice_actor-should-not-use-pos-in-sd.patch
 libsas-fix-panic-when-single-phy-is-disabled-on-a-wide-port.patch
 ahci-enable-sb600-64bit-dma-on-asus-m3a.patch
+hid-usbhid-add-support-for-sigma-micro-chip.patch
+hwmon-w83627ehf-properly-report-thermal-diode-sensors.patch