input: Add MSC_TIMESEC/_TIMEUSEC for android
Xiaohui Tao [Mon, 26 Aug 2013 21:42:43 +0000 (14:42 -0700)]
Eventhub defines two entries:
MSC_ANDROID_TIME_SEC 0x6
MSC_ANDROID_TIME_USEC 0x7

to pass the timestamp from the linux kernel to android
if the input devices have a better concetp of the time.
These two entries conflict with MSC_ACTIVITY which is
used for CPU_BOOST, which causes the first touc does not
work after lp0. Add the two entries in input.h to match
with android layer.

Bug 1354400

Change-Id: I5cc9b2605db609cebad96ad1b95433fa333e77f7
Signed-off-by: Xiaohui Tao <xtao@nvidia.com>
Reviewed-on: http://git-master/r/266219
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Tested-by: Mitch Luban <mluban@nvidia.com>

include/linux/mod_devicetable.h
include/uapi/linux/input.h

index f99846e..ff6368d 100644 (file)
@@ -278,7 +278,7 @@ struct pcmcia_device_id {
 #define INPUT_DEVICE_ID_KEY_MAX                0x2ff
 #define INPUT_DEVICE_ID_REL_MAX                0x0f
 #define INPUT_DEVICE_ID_ABS_MAX                0x3f
-#define INPUT_DEVICE_ID_MSC_MAX                0x07
+#define INPUT_DEVICE_ID_MSC_MAX                0x09
 #define INPUT_DEVICE_ID_LED_MAX                0x0f
 #define INPUT_DEVICE_ID_SND_MAX                0x07
 #define INPUT_DEVICE_ID_FF_MAX         0x7f
index fefb330..9ac65fb 100644 (file)
@@ -860,8 +860,10 @@ struct input_keymap_entry {
 #define MSC_RAW                        0x03
 #define MSC_SCAN               0x04
 #define MSC_TIMESTAMP          0x05
-#define MSC_ACTIVITY    0x06
-#define MSC_MAX                        0x07
+#define MSC_TIMESEC            0x06
+#define MSC_TIMEUSEC           0x07
+#define MSC_ACTIVITY           0x08
+#define MSC_MAX                        0x09
 #define MSC_CNT                        (MSC_MAX+1)
 
 /*