lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Input: sh_keysc - update the driver with mode 6

Browse Source 
Add mode 6 support to the sh_keysc driver. Also update the KYOUTDR mask
value to include all 16 register bits.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Magnus Damm
2010-02-10 23:03:22 -08:00
committed by Dmitry Torokhov
parent 324e5ade15
commit 8f8be2439c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/input/keyboard/sh_keysc.c
View File

@@ -31,6 +31,7 @@ static const struct {
[SH_KEYSC_MODE_3] = { 2, 4, 7 }, [SH_KEYSC_MODE_3] = { 2, 4, 7 },
[SH_KEYSC_MODE_4] = { 3, 6, 6 }, [SH_KEYSC_MODE_4] = { 3, 6, 6 },
[SH_KEYSC_MODE_5] = { 4, 6, 7 }, [SH_KEYSC_MODE_5] = { 4, 6, 7 },
[SH_KEYSC_MODE_6] = { 5, 7, 7 },
}; };
struct sh_keysc_priv { struct sh_keysc_priv {
@@ -109,7 +110,7 @@ static irqreturn_t sh_keysc_isr(int irq, void *dev_id)
n = keyin_nr * i; n = keyin_nr * i;
/* drive one KEYOUT pin low, read KEYIN pins */ /* drive one KEYOUT pin low, read KEYIN pins */
sh_keysc_write(priv, KYOUTDR, 0xfff ^ (3 << (i * 2))); sh_keysc_write(priv, KYOUTDR, 0xffff ^ (3 << (i * 2)));
udelay(pdata->delay); udelay(pdata->delay);
tmp = sh_keysc_read(priv, KYINDR); tmp = sh_keysc_read(priv, KYINDR);

6
include/linux/input/sh_keysc.h
View File

@@ -1,15 +1,15 @@
#ifndef __SH_KEYSC_H__ #ifndef __SH_KEYSC_H__
#define __SH_KEYSC_H__ #define __SH_KEYSC_H__
#define SH_KEYSC_MAXKEYS 42 #define SH_KEYSC_MAXKEYS 49
struct sh_keysc_info { struct sh_keysc_info {
enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3, enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3,
SH_KEYSC_MODE_4, SH_KEYSC_MODE_5 } mode; SH_KEYSC_MODE_4, SH_KEYSC_MODE_5, SH_KEYSC_MODE_6 } mode;
int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */ int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */
int delay; int delay;
int kycr2_delay; int kycr2_delay;
int keycodes[SH_KEYSC_MAXKEYS]; int keycodes[SH_KEYSC_MAXKEYS]; /* KEYIN * KEYOUT */
}; };
#endif /* __SH_KEYSC_H__ */ #endif /* __SH_KEYSC_H__ */