| Message ID | 1413636729-2985-1-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | 2175b0f739934e718bc27770afd3d285c470bb1b |
| Headers | show |
On Sat, Oct 18, 2014 at 02:52:09PM +0200, Linus Walleij wrote: > The bitmask comment says it will enable GPIO 8-14 and 16-20 > for keypad use, but it actually enables GPIO 8-11 and 13-20 > due to a bit error. > > Instead of masking of the "hole" at GPIO 12 (which is used > for keypad output 4) mask of the proper "hole" at GPIO 15. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > Hi Dmitry, this is for fixes I think. Applied, thank you. > --- > drivers/input/keyboard/stmpe-keypad.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/input/keyboard/stmpe-keypad.c b/drivers/input/keyboard/stmpe-keypad.c > index c6727dda68f2..ef5e67fb567e 100644 > --- a/drivers/input/keyboard/stmpe-keypad.c > +++ b/drivers/input/keyboard/stmpe-keypad.c > @@ -86,7 +86,7 @@ static const struct stmpe_keypad_variant stmpe_keypad_variants[] = { > .max_cols = 8, > .max_rows = 12, > .col_gpios = 0x0000ff, /* GPIO 0 - 7*/ > - .row_gpios = 0x1fef00, /* GPIO 8-14, 16-20 */ > + .row_gpios = 0x1f7f00, /* GPIO 8-14, 16-20 */ > }, > [STMPE2403] = { > .auto_increment = true, > -- > 1.9.3 >
diff --git a/drivers/input/keyboard/stmpe-keypad.c b/drivers/input/keyboard/stmpe-keypad.c index c6727dda68f2..ef5e67fb567e 100644 --- a/drivers/input/keyboard/stmpe-keypad.c +++ b/drivers/input/keyboard/stmpe-keypad.c @@ -86,7 +86,7 @@ static const struct stmpe_keypad_variant stmpe_keypad_variants[] = { .max_cols = 8, .max_rows = 12, .col_gpios = 0x0000ff, /* GPIO 0 - 7*/ - .row_gpios = 0x1fef00, /* GPIO 8-14, 16-20 */ + .row_gpios = 0x1f7f00, /* GPIO 8-14, 16-20 */ }, [STMPE2403] = { .auto_increment = true,
The bitmask comment says it will enable GPIO 8-14 and 16-20 for keypad use, but it actually enables GPIO 8-11 and 13-20 due to a bit error. Instead of masking of the "hole" at GPIO 12 (which is used for keypad output 4) mask of the proper "hole" at GPIO 15. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- Hi Dmitry, this is for fixes I think. --- drivers/input/keyboard/stmpe-keypad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)