aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/input
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2010-02-11 02:03:22 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-02-11 02:04:18 -0500
commit8f8be2439cd368cc6ba94888919ee90b5a26f0cb (patch)
tree6ef4e2d2088280cba59cb527e32e9f913cd355a8 /include/linux/input
parent324e5ade1569111a40c349726d8a2694b28d7943 (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 'include/linux/input')
-rw-r--r--include/linux/input/sh_keysc.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/input/sh_keysc.h b/include/linux/input/sh_keysc.h
index 2aff38bcf2ba..649dc7f12925 100644
--- a/include/linux/input/sh_keysc.h
+++ b/include/linux/input/sh_keysc.h
@@ -1,15 +1,15 @@
1#ifndef __SH_KEYSC_H__ 1#ifndef __SH_KEYSC_H__
2#define __SH_KEYSC_H__ 2#define __SH_KEYSC_H__
3 3
4#define SH_KEYSC_MAXKEYS 42 4#define SH_KEYSC_MAXKEYS 49
5 5
6struct sh_keysc_info { 6struct sh_keysc_info {
7 enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3, 7 enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3,
8 SH_KEYSC_MODE_4, SH_KEYSC_MODE_5 } mode; 8 SH_KEYSC_MODE_4, SH_KEYSC_MODE_5, SH_KEYSC_MODE_6 } mode;
9 int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */ 9 int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */
10 int delay; 10 int delay;
11 int kycr2_delay; 11 int kycr2_delay;
12 int keycodes[SH_KEYSC_MAXKEYS]; 12 int keycodes[SH_KEYSC_MAXKEYS]; /* KEYIN * KEYOUT */
13}; 13};
14 14
15#endif /* __SH_KEYSC_H__ */ 15#endif /* __SH_KEYSC_H__ */