[PATCH 0/2] omap-keypad fixes for OMAP2

[PATCH 0/2] omap-keypad fixes for OMAP2

[Peter Ujfalusi]

Hello,
The following two patches provides fixes for the omap-keypad
driver on OMAP2.

Peter Ujfalusi (2)
  OMAP2: omap-keypad: interrupt disable fix
  OMAP2: omap-keypad: Enable more than 6 rows

 drivers/input/keyboard/omap-keypad.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

[PATCH 1/1] OMAP2: omap-keypad: interrupt disable fix

[Peter Ujfalusi]

The GPIO interrupts has been disabled several times
after the first key press.
No need to disable - again - the interrupts in the omap_kp_scan_keypad
function on OMAP2.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 drivers/input/keyboard/omap-keypad.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index d57d2cb..d6cd79b 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -134,10 +134,6 @@ static void omap_kp_scan_keypad(struct omap_kp *omap_kp, unsigned char *state)
 
 	/* read the keypad status */
 	if (cpu_is_omap24xx()) {
-		int i;
-		for (i = 0; i < omap_kp->rows; i++)
-			disable_irq(OMAP_GPIO_IRQ(row_gpios[i]));
-
 		/* read the keypad status */
 		for (col = 0; col < omap_kp->cols; col++) {
 			set_col_gpio_val(omap_kp, ~(1 << col));
-- 
1.5.6.4

[PATCH 2/2] OMAP2: omap-keypad: Enable more than 6 rows

[Peter Ujfalusi]

There is no reason to limit the GPIO rows to 6 for
OMAP2.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 drivers/input/keyboard/omap-keypad.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index d6cd79b..0f95046 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -137,7 +137,7 @@ static void omap_kp_scan_keypad(struct omap_kp *omap_kp, unsigned char *state)
 		/* read the keypad status */
 		for (col = 0; col < omap_kp->cols; col++) {
 			set_col_gpio_val(omap_kp, ~(1 << col));
-			state[col] = ~(get_row_gpio_val(omap_kp)) & 0x3f;
+			state[col] = ~(get_row_gpio_val(omap_kp)) & 0xff;
 		}
 		set_col_gpio_val(omap_kp, 0);
 
-- 
1.5.6.4

Re: [PATCH 0/2] omap-keypad fixes for OMAP2

[Dmitry Torokhov]

Hi Peter,

On Thu, Oct 23, 2008 at 08:51:30AM +0300, Peter Ujfalusi wrote:
> Hello,
> The following two patches provides fixes for the omap-keypad
> driver on OMAP2.
> 
> Peter Ujfalusi (2)
>   OMAP2: omap-keypad: interrupt disable fix
>   OMAP2: omap-keypad: Enable more than 6 rows
> 
>  drivers/input/keyboard/omap-keypad.c |    6 +-----
>  1 files changed, 1 insertions(+), 5 deletions(-)
> 

Looks good, will apply to 'next' branch.

-- 
Dmitry