diff options
author | Magnus Damm <damm@opensource.se> | 2010-02-11 02:03:22 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-02-11 02:04:18 -0500 |
commit | 8f8be2439cd368cc6ba94888919ee90b5a26f0cb (patch) | |
tree | 6ef4e2d2088280cba59cb527e32e9f913cd355a8 /drivers/input | |
parent | 324e5ade1569111a40c349726d8a2694b28d7943 (diff) |
Input: sh_keysc - update the driver with mode 6
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>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/keyboard/sh_keysc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c index c2fc97732f0..854e2035cd6 100644 --- a/drivers/input/keyboard/sh_keysc.c +++ b/drivers/input/keyboard/sh_keysc.c | |||
@@ -31,6 +31,7 @@ static const struct { | |||
31 | [SH_KEYSC_MODE_3] = { 2, 4, 7 }, | 31 | [SH_KEYSC_MODE_3] = { 2, 4, 7 }, |
32 | [SH_KEYSC_MODE_4] = { 3, 6, 6 }, | 32 | [SH_KEYSC_MODE_4] = { 3, 6, 6 }, |
33 | [SH_KEYSC_MODE_5] = { 4, 6, 7 }, | 33 | [SH_KEYSC_MODE_5] = { 4, 6, 7 }, |
34 | [SH_KEYSC_MODE_6] = { 5, 7, 7 }, | ||
34 | }; | 35 | }; |
35 | 36 | ||
36 | struct sh_keysc_priv { | 37 | struct sh_keysc_priv { |
@@ -109,7 +110,7 @@ static irqreturn_t sh_keysc_isr(int irq, void *dev_id) | |||
109 | n = keyin_nr * i; | 110 | n = keyin_nr * i; |
110 | 111 | ||
111 | /* drive one KEYOUT pin low, read KEYIN pins */ | 112 | /* drive one KEYOUT pin low, read KEYIN pins */ |
112 | sh_keysc_write(priv, KYOUTDR, 0xfff ^ (3 << (i * 2))); | 113 | sh_keysc_write(priv, KYOUTDR, 0xffff ^ (3 << (i * 2))); |
113 | udelay(pdata->delay); | 114 | udelay(pdata->delay); |
114 | tmp = sh_keysc_read(priv, KYINDR); | 115 | tmp = sh_keysc_read(priv, KYINDR); |
115 | 116 | ||