[PATCH 1/2] Input: atkbd - add forced release keys quirk for Positivo I30

[PATCH 1/2] Input: atkbd - add forced release keys quirk for Positivo I30

[Herton Ronaldo Krzesinski]

Positivo I30 doesn't send release key event for volume up/down/mute
keys. The key list is the same as previous added Soltech TA12 quirk,
so integrate this using same list.

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
---
 drivers/input/keyboard/atkbd.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 4709e15..296f1fd 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -904,9 +904,10 @@ static unsigned int atkbd_amilo_xi3650_forced_release_keys[] = {
 };
 
 /*
- * Soltech TA12 system with broken key release on volume keys and mute key
+ * Many notebooks don't send key release event for volume up/down/mute
+ * keys, with key list below common among them
  */
-static unsigned int atkdb_soltech_ta12_forced_release_keys[] = {
+static unsigned int atkbd_mute_volume_forced_release_keys[] = {
 	0xa0, 0xae, 0xb0, -1U
 };
 
@@ -1647,7 +1648,16 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "TA12"),
 		},
 		.callback = atkbd_setup_forced_release,
-		.driver_data = atkdb_soltech_ta12_forced_release_keys,
+		.driver_data = atkbd_mute_volume_forced_release_keys,
+	},
+	{
+		.ident = "Positivo I30",
+		.matches = {
+			DMI_MATCH(DMI_BOARD_VENDOR, "POSITIVO"),
+			DMI_MATCH(DMI_BOARD_NAME, "I30"),
+		},
+		.callback = atkbd_setup_forced_release,
+		.driver_data = atkbd_mute_volume_forced_release_keys,
 	},
 	{ }
 };
-- 
1.6.4.4

[PATCH 2/2] Input: atkbd - remove duplicated release key list quirks for some machines

[Herton Ronaldo Krzesinski]

Some machines share same key list for volume up/down release key quirks,
use only one key list.

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
---
 drivers/input/keyboard/atkbd.c |   51 +++++++++++-----------------------------
 1 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 296f1fd..bddc55a 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -852,29 +852,6 @@ static unsigned int atkbd_hp_forced_release_keys[] = {
 };
 
 /*
- * Inventec system with broken key release on volume keys
- */
-static unsigned int atkbd_inventec_forced_release_keys[] = {
-	0xae, 0xb0, -1U
-};
-
-/*
- * Perform fixup for HP Pavilion ZV6100 laptop that doesn't generate release
- * for its volume buttons
- */
-static unsigned int atkbd_hp_zv6100_forced_release_keys[] = {
-	0xae, 0xb0, -1U
-};
-
-/*
- * Perform fixup for HP (Compaq) Presario R4000 R4100 R4200 that don't generate
- * release for their volume buttons
- */
-static unsigned int atkbd_hp_r4000_forced_release_keys[] = {
-	0xae, 0xb0, -1U
-};
-
-/*
  * Samsung NC10,NC20 with Fn+F? key release not working
  */
 static unsigned int atkbd_samsung_forced_release_keys[] = {
@@ -882,14 +859,6 @@ static unsigned int atkbd_samsung_forced_release_keys[] = {
 };
 
 /*
- * The volume up and volume down special keys on a Fujitsu Amilo PA 1510 laptop
- * do not generate release events so we have to do it ourselves.
- */
-static unsigned int atkbd_amilo_pa1510_forced_release_keys[] = {
-	0xb0, 0xae, -1U
-};
-
-/*
  * Amilo Pi 3525 key release for Fn+Volume keys not working
  */
 static unsigned int atkbd_amilo_pi3525_forced_release_keys[] = {
@@ -904,6 +873,14 @@ static unsigned int atkbd_amilo_xi3650_forced_release_keys[] = {
 };
 
 /*
+ * Many notebooks don't send key release event for volume up/down
+ * keys, with key list below common among them
+ */
+static unsigned int atkbd_volume_forced_release_keys[] = {
+	0xae, 0xb0, -1U
+};
+
+/*
  * Many notebooks don't send key release event for volume up/down/mute
  * keys, with key list below common among them
  */
@@ -1549,7 +1526,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion ZV6100"),
 		},
 		.callback = atkbd_setup_forced_release,
-		.driver_data = atkbd_hp_zv6100_forced_release_keys,
+		.driver_data = atkbd_volume_forced_release_keys,
 	},
 	{
 		.ident = "HP Presario R4000",
@@ -1558,7 +1535,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4000"),
 		},
 		.callback = atkbd_setup_forced_release,
-		.driver_data = atkbd_hp_r4000_forced_release_keys,
+		.driver_data = atkbd_volume_forced_release_keys,
 	},
 	{
 		.ident = "HP Presario R4100",
@@ -1567,7 +1544,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4100"),
 		},
 		.callback = atkbd_setup_forced_release,
-		.driver_data = atkbd_hp_r4000_forced_release_keys,
+		.driver_data = atkbd_volume_forced_release_keys,
 	},
 	{
 		.ident = "HP Presario R4200",
@@ -1576,7 +1553,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4200"),
 		},
 		.callback = atkbd_setup_forced_release,
-		.driver_data = atkbd_hp_r4000_forced_release_keys,
+		.driver_data = atkbd_volume_forced_release_keys,
 	},
 	{
 		.ident = "Inventec Symphony",
@@ -1585,7 +1562,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "SYMPHONY 6.0/7.0"),
 		},
 		.callback = atkbd_setup_forced_release,
-		.driver_data = atkbd_inventec_forced_release_keys,
+		.driver_data = atkbd_volume_forced_release_keys,
 	},
 	{
 		.ident = "Samsung NC10",
@@ -1621,7 +1598,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pa 1510"),
 		},
 		.callback = atkbd_setup_forced_release,
-		.driver_data = atkbd_amilo_pa1510_forced_release_keys,
+		.driver_data = atkbd_volume_forced_release_keys,
 	},
 	{
 		.ident = "Fujitsu Amilo Pi 3525",
-- 
1.6.4.4

Re: [PATCH 1/2] Input: atkbd - add forced release keys quirk for Positivo I30

[Dmitry Torokhov]

Hi Herton,

On Fri, Oct 16, 2009 at 07:18:14PM -0300, Herton Ronaldo Krzesinski wrote:
> Positivo I30 doesn't send release key event for volume up/down/mute
> keys. The key list is the same as previous added Soltech TA12 quirk,
> so integrate this using same list.
> 

Thank you for the patch but starting with 2.6.32 there is a way to
adjust the force release bitmap from userspace (via sysfs attribute) so
I will not be accepting any more quirks for the kernel.

-- 
Dmitry

Re: [PATCH 2/2] Input: atkbd - remove duplicated release key list quirks for some machines

[Dmitry Torokhov]

On Fri, Oct 16, 2009 at 07:18:15PM -0300, Herton Ronaldo Krzesinski wrote:
> Some machines share same key list for volume up/down release key quirks,
> use only one key list.
> 

Applied, thank you Herton.

-- 
Dmitry