renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
Code

Input: adp5589-keys - fix pull mask setting

Browse Source 
The pull mask is created by looping each row (column) and building an
8-bit integer with the configuration. It is written byte-by-byte, when
we reach the end of the rows (columns) or we're at the 3rd line (which
finishes the first byte, since each pin is 2bits on the mask).

However, this only works if we have at most 8 pins (2 bytes), which is
not the case for the ADP5589. So, write the byte at each boundary (every
4 rows/columns).

Signed-off-by: Guido Martínez <guido@vanguardiasur.com.ar>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Guido Martínez 2015-05-06 16:33:40 -07:00 committed by Dmitry Torokhov
parent c9eeb5084b
commit 195e610bf7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/keyboard/adp5589-keys.c
View File

@ -726,7 +726,7 @@ static int adp5589_setup(struct adp5589_kpad *kpad)
pull_mask |= val << (2 * (i & 0x3)); pull_mask |= val << (2 * (i & 0x3));
if (i == 3 || i == kpad->var->max_row_num) { if (i % 4 == 3 || i == kpad->var->max_row_num) {
ret |= adp5589_write(client, reg(ADP5585_RPULL_CONFIG_A) ret |= adp5589_write(client, reg(ADP5585_RPULL_CONFIG_A)
+ (i >> 2), pull_mask); + (i >> 2), pull_mask);
pull_mask = 0; pull_mask = 0;
@ -746,7 +746,7 @@ static int adp5589_setup(struct adp5589_kpad *kpad)
pull_mask |= val << (2 * (i & 0x3)); pull_mask |= val << (2 * (i & 0x3));
if (i == 3 || i == kpad->var->max_col_num) { if (i % 4 == 3 || i == kpad->var->max_col_num) {
ret |= adp5589_write(client, ret |= adp5589_write(client,
reg(ADP5585_RPULL_CONFIG_C) + reg(ADP5585_RPULL_CONFIG_C) +
(i >> 2), pull_mask); (i >> 2), pull_mask);