summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2010-02-11 08:03:22 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-02-11 08:04:18 +0100
commit8f8be2439cd368cc6ba94888919ee90b5a26f0cb (patch)
tree6ef4e2d2088280cba59cb527e32e9f913cd355a8 /include
parentInput: sh_keysc - switch to using bitmaps (diff)
downloadlinux-8f8be2439cd368cc6ba94888919ee90b5a26f0cb.tar.xz
linux-8f8be2439cd368cc6ba94888919ee90b5a26f0cb.zip
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')
-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 @@
#ifndef __SH_KEYSC_H__
#define __SH_KEYSC_H__
-#define SH_KEYSC_MAXKEYS 42
+#define SH_KEYSC_MAXKEYS 49
struct sh_keysc_info {
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 delay;
int kycr2_delay;
- int keycodes[SH_KEYSC_MAXKEYS];
+ int keycodes[SH_KEYSC_MAXKEYS]; /* KEYIN * KEYOUT */
};
#endif /* __SH_KEYSC_H__ */