| pxa27x_keypad.c (6ce34a5fb4955fac1eebe080e1c2784bc8710449) | pxa27x_keypad.c (5545fa897a0a1a34249e98ea4244b256cbe58df3) |
|---|---|
| 1/* 2 * linux/drivers/input/keyboard/pxa27x_keypad.c 3 * 4 * Driver for the pxa27x matrix keyboard controller. 5 * 6 * Created: Feb 22, 2007 7 * Author: Rodolfo Giometti <giometti@linux.it> 8 * --- 369 unchanged lines hidden (view full) --- 378 mask |= 0x0c; 379 direct_key_num = 4; 380 kpc |= KPC_REE1; 381 } 382 383 if (pdata->direct_key_num > direct_key_num) 384 direct_key_num = pdata->direct_key_num; 385 | 1/* 2 * linux/drivers/input/keyboard/pxa27x_keypad.c 3 * 4 * Driver for the pxa27x matrix keyboard controller. 5 * 6 * Created: Feb 22, 2007 7 * Author: Rodolfo Giometti <giometti@linux.it> 8 * --- 369 unchanged lines hidden (view full) --- 378 mask |= 0x0c; 379 direct_key_num = 4; 380 kpc |= KPC_REE1; 381 } 382 383 if (pdata->direct_key_num > direct_key_num) 384 direct_key_num = pdata->direct_key_num; 385 |
| 386 keypad->direct_key_mask = ((2 << direct_key_num) - 1) & ~mask; | 386 keypad->direct_key_mask = ((1 << direct_key_num) - 1) & ~mask; |
| 387 388 /* enable direct key */ 389 if (direct_key_num) 390 kpc |= KPC_DE | KPC_DIE | KPC_DKN(direct_key_num); 391 392 keypad_writel(KPC, kpc | KPC_RE_ZERO_DEB); 393 keypad_writel(KPREC, DEFAULT_KPREC); 394 keypad_writel(KPKDI, pdata->debounce_interval); --- 223 unchanged lines hidden --- | 387 388 /* enable direct key */ 389 if (direct_key_num) 390 kpc |= KPC_DE | KPC_DIE | KPC_DKN(direct_key_num); 391 392 keypad_writel(KPC, kpc | KPC_RE_ZERO_DEB); 393 keypad_writel(KPREC, DEFAULT_KPREC); 394 keypad_writel(KPKDI, pdata->debounce_interval); --- 223 unchanged lines hidden --- |