tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Input: appletouch - add Geyser IV support
The new Core2 Duo MacBook Pro has a new keyboard+trackpad named
"Geyser IV".
According to the Info.plist in the OS X kext, it looks like the Geyser
IV trackpad is identical to the Geyser III trackpad: same IOClass
(AppleUSBGrIIITrackpad), same acceleration tables.
Signed-off-by: Julien BLACHE <jb@jblache.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
authored by
Julien BLACHE
and committed by
Dmitry Torokhov
009ad0e7
00081d37
+19
-2
+19
-2
drivers/usb/input/appletouch.c
+19
-2
drivers/usb/input/appletouch.c
···
47
47
#define GEYSER3_ISO_PRODUCT_ID 0x0218
48
48
#define GEYSER3_JIS_PRODUCT_ID 0x0219
49
49
50
+
/*
51
+
* Geyser IV: same as Geyser III according to Info.plist in AppleUSBTrackpad.kext
52
+
* -> same IOClass (AppleUSBGrIIITrackpad), same acceleration tables
53
+
*/
54
+
#define GEYSER4_ANSI_PRODUCT_ID 0x021A
55
+
#define GEYSER4_ISO_PRODUCT_ID 0x021B
56
+
#define GEYSER4_JIS_PRODUCT_ID 0x021C
57
+
50
58
#define ATP_DEVICE(prod) \
51
59
.match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
52
60
USB_DEVICE_ID_MATCH_INT_CLASS | \
···
76
68
{ ATP_DEVICE(GEYSER_ISO_PRODUCT_ID) },
77
69
{ ATP_DEVICE(GEYSER_JIS_PRODUCT_ID) },
78
70
71
+
/* Core Duo MacBook & MacBook Pro */
79
72
{ ATP_DEVICE(GEYSER3_ANSI_PRODUCT_ID) },
80
73
{ ATP_DEVICE(GEYSER3_ISO_PRODUCT_ID) },
81
74
{ ATP_DEVICE(GEYSER3_JIS_PRODUCT_ID) },
75
+
76
+
/* Core2 Duo MacBook & MacBook Pro */
77
+
{ ATP_DEVICE(GEYSER4_ANSI_PRODUCT_ID) },
78
+
{ ATP_DEVICE(GEYSER4_ISO_PRODUCT_ID) },
79
+
{ ATP_DEVICE(GEYSER4_JIS_PRODUCT_ID) },
82
80
83
81
/* Terminating entry */
84
82
{ }
···
122
108
*/
123
109
#define ATP_THRESHOLD 5
124
110
125
-
/* MacBook Pro (Geyser 3) initialization constants */
111
+
/* MacBook Pro (Geyser 3 & 4) initialization constants */
126
112
#define ATP_GEYSER3_MODE_READ_REQUEST_ID 1
127
113
#define ATP_GEYSER3_MODE_WRITE_REQUEST_ID 9
128
114
#define ATP_GEYSER3_MODE_REQUEST_VALUE 0x300
···
195
181
196
182
return (productId == GEYSER3_ANSI_PRODUCT_ID) ||
197
183
(productId == GEYSER3_ISO_PRODUCT_ID) ||
198
-
(productId == GEYSER3_JIS_PRODUCT_ID);
184
+
(productId == GEYSER3_JIS_PRODUCT_ID) ||
185
+
(productId == GEYSER4_ANSI_PRODUCT_ID) ||
186
+
(productId == GEYSER4_ISO_PRODUCT_ID) ||
187
+
(productId == GEYSER4_JIS_PRODUCT_ID);
199
188
}
200
189
201
190
static int atp_calculate_abs(int *xy_sensors, int nb_sensors, int fact,