[PATCH 2/6] MacBookAir3,1(3,2) touchpad ( bcm5974 ) support

[PATCH 2/6] MacBookAir3,1(3,2) touchpad ( bcm5974 ) support

[gimli]

[-- Attachment #1: Type: text/plain, Size: 145 bytes --]

This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the
bcm5974 driver.

Signed-off-by: Edgar (gimli) Hucek <gimli@dark-green.com>

[-- Attachment #2: bcm5974_macbookair.patch --]
[-- Type: text/plain, Size: 2755 bytes --]

diff -uNr linux-2.6.35/drivers/input/mouse/bcm5974.c linux-2.6.35-MacbookAir/drivers/input/mouse/bcm5974.c
--- linux-2.6.35/drivers/input/mouse/bcm5974.c	2010-10-23 06:59:31.000000000 +0200
+++ linux-2.6.35-MacbookAir/drivers/input/mouse/bcm5974.c	2010-10-24 07:38:15.795679002 +0200
@@ -55,6 +55,14 @@
 #define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI	0x0236
 #define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO	0x0237
 #define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS	0x0238
+/* MacbookAir3,2 (unibody), aka wellspring5 */
+#define USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI	0x023f
+#define USB_DEVICE_ID_APPLE_WELLSPRING4_ISO	0x0240
+#define USB_DEVICE_ID_APPLE_WELLSPRING4_JIS	0x0241
+/* MacbookAir3,1 (unibody), aka wellspring4 */
+#define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI	0x0242
+#define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO	0x0243
+#define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS	0x0244
 
 #define BCM5974_DEVICE(prod) {					\
 	.match_flags = (USB_DEVICE_ID_MATCH_DEVICE |		\
@@ -80,6 +88,14 @@
 	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI),
 	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_ISO),
 	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
+	/* MacbookAir3,2 */
+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI),
+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4_ISO),
+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4_JIS),
+	/* MacbookAir3,1 */
+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI),
+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO),
+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS),
 	/* Terminating entry */
 	{}
 };
@@ -229,6 +245,30 @@
 		HAS_INTEGRATED_BUTTON,
 		0x84, sizeof(struct bt_data),
 		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
+		{ DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
+		{ DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
+		{ DIM_X, DIM_X / SN_COORD, -4460, 5166 },
+		{ DIM_Y, DIM_Y / SN_COORD, -75, 6700 }
+	},
+	{
+		USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI,
+		USB_DEVICE_ID_APPLE_WELLSPRING4_ISO,
+		USB_DEVICE_ID_APPLE_WELLSPRING4_JIS,
+		HAS_INTEGRATED_BUTTON,
+		0x84, sizeof(struct bt_data),
+		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
+		{ DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
+		{ DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
+		{ DIM_X, DIM_X / SN_COORD, -4460, 5166 },
+		{ DIM_Y, DIM_Y / SN_COORD, -75, 6700 }
+	},
+	{
+		USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI,
+		USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO,
+		USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS,
+		HAS_INTEGRATED_BUTTON,
+		0x84, sizeof(struct bt_data),
+		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
 		{ DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
 		{ DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
 		{ DIM_X, DIM_X / SN_COORD, -4460, 5166 },

Re: [PATCH 2/6] MacBookAir3,1(3,2) touchpad ( bcm5974 ) support

[Henrik Rydberg]

On 11/02/2010 08:18 AM, gimli wrote:

> This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the
> bcm5974 driver.
> 
> Signed-off-by: Edgar (gimli) Hucek <gimli@dark-green.com>


Thanks for your patches. Do the usb message packet lengths of these new device
ids differ in any respect from the old ones? What is the difference between the
two sets of ids? Physical size? Are the devices really exactly the same?

Any additional information you can provide to shed light on these questions
would be greatly appreciated. My concern is that there might be more things that
need to be changed for these devices.

Thanks,
Henrik

Re: [PATCH 2/6] MacBookAir3,1(3,2) touchpad ( bcm5974 ) support

[gimli]

On Tue, 02 Nov 2010 17:51:58 +0100, Henrik Rydberg <rydberg@euromail.se>
wrote:
> On 11/02/2010 08:18 AM, gimli wrote:
> 
>> This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the
>> bcm5974 driver.
>> 
>> Signed-off-by: Edgar (gimli) Hucek <gimli@dark-green.com>
> 
> 
> Thanks for your patches. Do the usb message packet lengths of these new
> device
> ids differ in any respect from the old ones? What is the difference
between
> the
> two sets of ids? Physical size? Are the devices really exactly the same?
> 
> Any additional information you can provide to shed light on these
questions
> would be greatly appreciated. My concern is that there might be more
things
> that
> need to be changed for these devices.

What i did was asuming the touchpad works similiar to the WELLSPRING3 ones.
So i took the names from the Apple kext's and used the values from the
WELLSPRING3.
If i can with any debug output let me know how to make it and i'll more
than happy
to send it.
As far as i see only the Size on the new ones differ. 

lg

Edgar (gimli) Hucek

> Thanks,
> Henrik
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel"
in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 2/6] MacBookAir3,1(3,2) touchpad ( bcm5974 ) support

[Henrik Rydberg]

On 11/03/2010 11:56 AM, gimli wrote:
[...]

>> Any additional information you can provide to shed light on these
> questions
>> would be greatly appreciated. My concern is that there might be more
> things
>> that
>> need to be changed for these devices.
> 
> What i did was asuming the touchpad works similiar to the WELLSPRING3 ones.
> So i took the names from the Apple kext's and used the values from the
> WELLSPRING3.
> If i can with any debug output let me know how to make it and i'll more
> than happy
> to send it.
> As far as i see only the Size on the new ones differ. 


Thanks for the background and your work on this. Yes, let's hash out the
reamining details in the forums, and leave this thread until then. Will get my
hands on one of the 11'' today as well. :-)

Cheers,
Henrik