rpms/kernel/F-9 linux-2.6-input.git-atkbd-add-quirk-for-inventec.patch, NONE, 1.1 linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch, NONE, 1.1 kernel.spec, 1.863, 1.864

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-input.git-atkbd-add-quirk-for-inventec.patch 
	linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch 
Log Message:
Fix Zepto notebook multimedia keys (#460237)
Fix Dell XPS 1530 trackpad (#448656)

linux-2.6-input.git-atkbd-add-quirk-for-inventec.patch:

--- NEW FILE linux-2.6-input.git-atkbd-add-quirk-for-inventec.patch ---
From: Matthew Garrett <mjg at redhat.com>
Date: Tue, 11 Nov 2008 14:40:42 +0000 (-0500)
Subject: Input: atkbd - add keymap quirk for Inventec Symphony systems
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdtor%2Finput.git;a=commitdiff_plain;h=a8215b81cc31cf267506bc6a4a4bfe93f4ca1652

Input: atkbd - add keymap quirk for Inventec Symphony systems

The Zepto 6615WD laptop (rebranded Inventec Symphony system) needs a
key release quirk for its volume keys to work. The attached patch adds
the quirk to the atkbd driver.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=460237

Signed-off-by: Matthew Garrett <mjg at redhat.com>
Signed-off-by: Adel Gadllah <adel.gadllah at gmail.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
---

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 22016ca..c93b9b4 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -868,6 +868,22 @@ static void atkbd_hp_keymap_fixup(struct atkbd *atkbd)
 }
 
 /*
+ * Inventec system with broken key release on volume keys
+ */
+static void atkbd_inventec_keymap_fixup(struct atkbd *atkbd)
+{
+	const unsigned int forced_release_keys[] = {
+		0xae, 0xb0,
+	};
+	int i;
+
+	if (atkbd->set == 2)
+		for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++)
+			__set_bit(forced_release_keys[i],
+				  atkbd->force_release_mask);
+}
+
+/*
  * atkbd_set_keycode_table() initializes keyboard's keycode table
  * according to the selected scancode set
  */
@@ -1468,6 +1484,15 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
 		.callback = atkbd_setup_fixup,
 		.driver_data = atkbd_hp_keymap_fixup,
 	},
+	{
+		.ident = "Inventec Symphony",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "INVENTEC"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "SYMPHONY 6.0/7.0"),
+		},
+		.callback = atkbd_setup_fixup,
+		.driver_data = atkbd_inventec_keymap_fixup,
+	},
 	{ }
 };
 

linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch:

--- NEW FILE linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch ---
From: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
Date: Tue, 11 Nov 2008 14:37:14 +0000 (-0500)
Subject: Input: i8042 - add Dell XPS M1530 to nomux list
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdtor%2Finput.git;a=commitdiff_plain;h=786b11cc0f505e44c29f778fd329dafafafed76c

Input: i8042 - add Dell XPS M1530 to nomux list

Dell XPS M1530 needs i8042.nomux=1 for ALPS touchpad to work as
reported on https://qa.mandriva.com/show_bug.cgi?id=43532

It is said that before A08 bios version this isn't needed (I don't
have the hardware so can't check), and suppose this will not break
with bios versions before A08.

Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
Tested-by: Andreas Ericsson <ae at op5.se>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
---

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index eec375c..5db1d0b 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -337,6 +337,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "2656"),
 		},
 	},
+	{
+		.ident = "Dell XPS M1530",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "XPS M1530"),
+		},
+	},
 	{ }
 };
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.863
retrieving revision 1.864
diff -u -r1.863 -r1.864
--- kernel.spec	21 Nov 2008 23:57:01 -0000	1.863
+++ kernel.spec	25 Nov 2008 16:29:59 -0000	1.864
@@ -647,6 +647,11 @@
 
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch452: linux-2.6.27-hwmon-applesmc-2.6.28.patch
+# 460237
+Patch453: linux-2.6-input.git-atkbd-add-quirk-for-inventec.patch
+# 448656
+Patch454: linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch
+
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
 # hush pci bar allocation failures
@@ -1204,6 +1209,10 @@
 ApplyPatch linux-2.6-input-kill-stupid-messages.patch
 # kill annoying applesmc debug messages
 ApplyPatch linux-2.6.27-hwmon-applesmc-2.6.28.patch
+# 460237
+ApplyPatch linux-2.6-input.git-atkbd-add-quirk-for-inventec.patch
+# 448656
+ApplyPatch linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
@@ -1892,6 +1901,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
+* 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)
+
 * Fri Nov 21 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.7-50
 - Two USB patches scheduled for the next -stable release.