Re: [PATCH] input: bcm5974: Add support for newer MacBookPro8,2

[Wanlong Gao <gaowanlong@cn.fujitsu.com>]

On 08/16/2011 04:31 PM, Andrew Drake wrote:
> On 08/16/2011 01:21 AM, Wanlong Gao wrote:
>> On 08/16/2011 04:05 PM, Andrew Drake wrote:
>>> On 08/16/2011 12:13 AM, Wanlong Gao wrote:
>>>> On 08/16/2011 02:20 PM, Andrew Drake wrote:
>>>>> I just received a new MacBook Pro, product name MacBookPro8,2. It came
>>>>> with a newer/higher resolution touchpad than others with the same
>>>>> product name with USB ID 05ac:0252. The following patch (which applies
>>>>> on top of 3.1-rc2) adds support for this device.
>>>>>
>>>>> <snip>
>>>> I wonder that why can't I apply this patch?
>>>> #git am<[path]>
>>>> Applying: input: bcm5974: Add support for newer MacBookPro8,2
>>>> fatal: corrupt patch at line 32
>>>> Patch failed at 0001 input: bcm5974: Add support for newer
>>>> MacBookPro8,2
>>>>
>>>
>>> Sorry, my mailer wrapped some of the lines. Try this:
>>>
>>>
>>> Signed-off-by: Andrew Drake<adrake@adrake.org>
>>> ---
>>> drivers/input/mouse/bcm5974.c | 20 ++++++++++++++++++++
>>> 1 files changed, 20 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/drivers/input/mouse/bcm5974.c
>>> b/drivers/input/mouse/bcm5974.c
>>> index 3126983..a0a4964 100644
>>> --- a/drivers/input/mouse/bcm5974.c
>>> +++ b/drivers/input/mouse/bcm5974.c
>>> @@ -67,6 +67,10 @@
>>> #define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245
>>> #define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246
>>> #define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247
>>> +/* Macbook8,2 (unibody) */
>>> +#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI 0x0252
>>> +#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO 0x0253
>>> +#define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS 0x0254
>>>
>>> #define BCM5974_DEVICE(prod) { \
>>> .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \
>>> @@ -104,6 +108,10 @@ static const struct usb_device_id bcm5974_table[]
>>> = {
>>> BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),
>>> BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),
>>> BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),
>>> + /* MacbookPro8,2 */
>>> + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI),
>>> + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO),
>>> + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS),
>>> /* Terminating entry */
>>> {}
>>> };
>>> @@ -294,6 +302,18 @@ static const struct bcm5974_config
>>> bcm5974_config_table[] = {
>>> { DIM_X, DIM_X / SN_COORD, -4415, 5050 },
>>> { DIM_Y, DIM_Y / SN_COORD, -55, 6680 }
>>> },
>>> + {
>>> + USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI,
>>> + USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO,
>>> + USB_DEVICE_ID_APPLE_WELLSPRING5A_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, -4750, 5280 },
>>> + { DIM_Y, DIM_Y / SN_COORD, -150, 6730 }
>>> + },
>>> {}
>>> };
>>>
>> Applying: input: bcm5974: Add support for newer MacBookPro8,2
>> error: patch failed: drivers/input/mouse/bcm5974.c:67
>> error: drivers/input/mouse/bcm5974.c: patch does not apply
>> Patch failed at 0001 input: bcm5974: Add support for newer MacBookPro8,2
>>
>>
>
> Now I'm confused. I tried applying at commit
> b5ddbf465f3675b19c8f5528b4064cbf278a5c6f, the HEAD of linux.git at the
> time of writing and got:
>
> $ git am <path.eml>:
> Applying: input: bcm5974: Add support for newer MacBookPro8,2
> $
>
> The email above was just git format-patch -s. Should I make a patch
> against a different tree?
>
Yeah, I can apply this to linus' tree, too.
But it seems conflict on Dmitry's input tree.
I think you can make a patch against Dmitry's tree, but I'm not sure, yet.

I CCed it to Dmitry.

-- 
Thanks
Wanlong Gao