Skip to contentSkip to conversation

input: bcm5974: Add support for newer MacBookPro8,2

PATCH Superseded Andrew Drake 2 participants 9 messages Aug 16, 2011

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 input: bcm5974: Add support for newer MacBookPro8,2

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.

---
 drivers/input/mouse/bcm5974.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
drivers/input/mouse/bcm5974.c +8 -0
index 3126983..a0a4964 100644
@@ -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 }
+ },
{}
};

#1 lore raw
Quoted 49 lines · Andrew Drake

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.

---
  drivers/input/mouse/bcm5974.c |   20 ++++++++++++++++++++
  1 files changed, 20 insertions(+), 0 deletions(-)
drivers/input/mouse/bcm5974.c +16 -0
index 3126983..a0a4964 100644
@@ -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 },

drivers/input/mouse/bcm5974.c static const struct bcm5974_config

Quoted 10 lines
drivers/input/mouse/bcm5974.c +4 -1
+		{ DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
+		{ DIM_X, DIM_X / SN_COORD, -4750, 5280 },
+		{ DIM_Y, DIM_Y / SN_COORD, -150, 6730 }
+	},
  	{}
  };
 
 
 
--

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

Signature · 2 lines
Thanks
Wanlong Gao
#2 lore raw
Quoted 6 lines · Wanlong Gao
Quoted 5 lines · Andrew Drake

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.

Quoted 7 lines
Quoted 1 line

<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:

---
 drivers/input/mouse/bcm5974.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
drivers/input/mouse/bcm5974.c +20 -0
index 3126983..a0a4964 100644
@@ -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 }
+	},
 	{}
 };
 
Signature · 1 line
1.7.6
#3 lore raw
Quoted 58 lines · Andrew Drake
Quoted 6 lines · Wanlong Gao
Quoted 5 lines · Andrew Drake

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.

Quoted 7 lines
Quoted 1 line

<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:

---
  drivers/input/mouse/bcm5974.c |   20 ++++++++++++++++++++
  1 files changed, 20 insertions(+), 0 deletions(-)
drivers/input/mouse/bcm5974.c +13 -0
index 3126983..a0a4964 100644
@@ -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,

drivers/input/mouse/bcm5974.c static const struct bcm5974_config bcm5974_config_table[] = { · line 319

Quoted 10 lines
drivers/input/mouse/bcm5974.c +7 -0
+		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

Signature · 2 lines
Thanks
Wanlong Gao
#4 lore raw
Quoted 68 lines · Wanlong Gao
Quoted 67 lines · Andrew Drake
Quoted 6 lines · Wanlong Gao
Quoted 5 lines · Andrew Drake

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.

Quoted 7 lines
Quoted 1 line

<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:

---
drivers/input/mouse/bcm5974.c | 20 ++++++++++++++++++++

1 files changed, 20 insertions(+), 0 deletions(-)
drivers/input/mouse/bcm5974.c +8 -0
index 3126983..a0a4964 100644
@@ -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 */
 {}

};

drivers/input/mouse/bcm5974.c +11 -0
@@ -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 }
Quoted 10 lines

drivers/input/mouse/bcm5974.c static const struct bcm5974_config bcm5974_config_table[] = { · line 318

Quoted 4 lines
drivers/input/mouse/bcm5974.c +1 -0
+ },
 {}
 };

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?

#5 lore raw
Quoted 85 lines · Andrew Drake
Quoted 69 lines · Wanlong Gao
Quoted 68 lines · Andrew Drake
Quoted 6 lines · Wanlong Gao
Quoted 5 lines · Andrew Drake

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.

Quoted 8 lines
Quoted 1 line

<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:

---
drivers/input/mouse/bcm5974.c | 20 ++++++++++++++++++++

1 files changed, 20 insertions(+), 0 deletions(-)
drivers/input/mouse/bcm5974.c +8 -0
index 3126983..a0a4964 100644
@@ -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 */
 {}

};

drivers/input/mouse/bcm5974.c +11 -0
@@ -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 }
Quoted 10 lines

drivers/input/mouse/bcm5974.c static const struct bcm5974_config bcm5974_config_table[] = { · line 318

Quoted 4 lines
drivers/input/mouse/bcm5974.c +1 -0
+ },
 {}
 };

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:

Quoted 6 lines
$ 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?

http://git.kernel.org/?p=linux/kernel/git/dtor/input.git;a=commitdiff;h=db0b34b07438d92c4c190998c42a502fbf90064e

May this conflict yours. It add the *MacBookAir4,2*. You can make patch based this patch applied, right?

Signature · 2 lines
Thanks
Wanlong Gao
#6 lore raw
Quoted 40 lines · Wanlong Gao
Quoted 39 lines · Andrew Drake
Quoted 19 lines · Wanlong Gao
Quoted 18 lines · Andrew Drake
Quoted 16 lines · Wanlong Gao
Quoted 8 lines · Andrew Drake

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

Quoted 10 lines
Quoted 4 lines

Sorry, my mailer wrapped some of the lines. Try this:

<snip>

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
$
Quoted 8 lines
Quoted 2 lines

The email above was just git format-patch -s. Should I make a patch against a different tree?

http://git.kernel.org/?p=linux/kernel/git/dtor/input.git;a=commitdiff;h=db0b34b07438d92c4c190998c42a502fbf90064e

May this conflict yours. It add the *MacBookAir4,2*. You can make patch based this patch applied, right?

Good catch! I had the wrong tree. Rebased:

---
 drivers/input/mouse/bcm5974.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
drivers/input/mouse/bcm5974.c +20 -0
index 48d9ec1..da28018 100644
@@ -71,6 +71,10 @@
 #define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI	0x024c
 #define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO	0x024d
 #define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS	0x024e
+/* 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 |		\
@@ -112,6 +116,10 @@ static const struct usb_device_id bcm5974_table[] = {
 	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI),
 	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_ISO),
 	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_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 */
 	{}
 };
@@ -314,6 +322,18 @@ static const struct bcm5974_config bcm5974_config_table[] = {
 		{ DIM_X, DIM_X / SN_COORD, -4620, 5140 },
 		{ DIM_Y, DIM_Y / SN_COORD, -150, 6600 }
 	},
+	{
+		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 }
+	},
 	{}
 };
 -- 1.7.6
#7 lore raw
Quoted 92 lines · Andrew Drake
Quoted 40 lines · Wanlong Gao
Quoted 39 lines · Andrew Drake
Quoted 19 lines · Wanlong Gao
Quoted 18 lines · Andrew Drake
Quoted 16 lines · Wanlong Gao
Quoted 8 lines · Andrew Drake

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

Quoted 10 lines
Quoted 4 lines

Sorry, my mailer wrapped some of the lines. Try this:

<snip>

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
$
Quoted 8 lines
Quoted 2 lines

The email above was just git format-patch -s. Should I make a patch against a different tree?

http://git.kernel.org/?p=linux/kernel/git/dtor/input.git;a=commitdiff;h=db0b34b07438d92c4c190998c42a502fbf90064e

May this conflict yours. It add the *MacBookAir4,2*. You can make patch based this patch applied, right?

Good catch! I had the wrong tree. Rebased:

---
  drivers/input/mouse/bcm5974.c |   20 ++++++++++++++++++++
  1 files changed, 20 insertions(+), 0 deletions(-)
drivers/input/mouse/bcm5974.c +13 -0
index 48d9ec1..da28018 100644
@@ -71,6 +71,10 @@
  #define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI	0x024c
  #define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO	0x024d
  #define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS	0x024e
+/* 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 |		\
@@ -112,6 +116,10 @@ static const struct usb_device_id bcm5974_table[] = {
  	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI),
  	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_ISO),
  	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_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 */
  	{}
  };
@@ -314,6 +322,18 @@ static const struct bcm5974_config bcm5974_config_table[] = {
  		{ DIM_X, DIM_X / SN_COORD, -4620, 5140 },
  		{ DIM_Y, DIM_Y / SN_COORD, -150, 6600 }
  	},
+	{
+		USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI,
+		USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO,
+		USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS,
+		HAS_INTEGRATED_BUTTON,

drivers/input/mouse/bcm5974.c static const struct bcm5974_config bcm5974_config_table[] = { · line 339

Quoted 10 lines
drivers/input/mouse/bcm5974.c +7 -0
+		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 }
+	},
  	{}
  };
  -- 1.7.6

It seems good now, but I think you would resend another version with no mailer wrapped, and feel free to add my review-by or acked-by.

Signature · 2 lines
Thanks
Wanlong Gao
#8 lore raw
In reply to Andrew Drake
Quoted 85 lines · Andrew Drake
Quoted 69 lines · Wanlong Gao
Quoted 68 lines · Andrew Drake
Quoted 6 lines · Wanlong Gao
Quoted 5 lines · Andrew Drake

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.

Quoted 8 lines
Quoted 1 line

<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:

---
drivers/input/mouse/bcm5974.c | 20 ++++++++++++++++++++

1 files changed, 20 insertions(+), 0 deletions(-)
drivers/input/mouse/bcm5974.c +8 -0
index 3126983..a0a4964 100644
@@ -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 */
 {}

};

drivers/input/mouse/bcm5974.c +11 -0
@@ -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 }
Quoted 10 lines

drivers/input/mouse/bcm5974.c static const struct bcm5974_config bcm5974_config_table[] = { · line 318

Quoted 4 lines
drivers/input/mouse/bcm5974.c +1 -0
+ },
 {}
 };

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:

Quoted 7 lines
$ 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.

Signature · 2 lines
Thanks
Wanlong Gao