Patchwork UBUNTU: SAUCE: add support for Lenovo tablet ID (0xE6)

login
register
mail settings
Submitter Manoj Iyer
Date March 31, 2011, 7:45 p.m.
Message ID <1301600747-5354-2-git-send-email-manoj.iyer@canonical.com>
Download mbox | patch
Permalink /patch/89123/
State New
Headers show

Comments

Manoj Iyer - March 31, 2011, 7:45 p.m.
Patch was submitted upstream, upstream has changed the way
resolutions are reported, so I need to rework the upstream
patch based on for-linus tree. Not sure when the upstrea
patches will get merged to linus tree. More information here:
https://lkml.org/lkml/2011/3/31/403

BugLink: http://bugs.launchpad.net/bugs/746652

Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
---
 drivers/input/tablet/wacom_wac.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
Tim Gardner - April 1, 2011, 2:29 p.m.
On 03/31/2011 01:45 PM, Manoj Iyer wrote:
> Patch was submitted upstream, upstream has changed the way
> resolutions are reported, so I need to rework the upstream
> patch based on for-linus tree. Not sure when the upstrea
> patches will get merged to linus tree. More information here:
> https://lkml.org/lkml/2011/3/31/403
>
> BugLink: http://bugs.launchpad.net/bugs/746652
>
> Signed-off-by: Manoj Iyer<manoj.iyer@canonical.com>
> ---
>   drivers/input/tablet/wacom_wac.c |    3 +++
>   1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
> index 7e0581c..98067d7 100644
> --- a/drivers/input/tablet/wacom_wac.c
> +++ b/drivers/input/tablet/wacom_wac.c
> @@ -1285,6 +1285,8 @@ static const struct wacom_features wacom_features_0xE2 =
>   	{ "Wacom ISDv4 E2",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG };
>   static const struct wacom_features wacom_features_0xE3 =
>   	{ "Wacom ISDv4 E3",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG };
> +static const struct wacom_features wacom_features_0xE6 =
> +	{ "ISD-V4",       	  WACOM_PKGLEN_TPC2FG,    27760, 15694,  255,  0, TABLETPC2FG };
>   static const struct wacom_features wacom_features_0x47 =
>   	{ "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS };
>   static struct wacom_features wacom_features_0xD0 =
> @@ -1360,6 +1362,7 @@ const struct usb_device_id wacom_ids[] = {
>   	{ USB_DEVICE_WACOM(0x9F) },
>   	{ USB_DEVICE_WACOM(0xE2) },
>   	{ USB_DEVICE_WACOM(0xE3) },
> +	{ USB_DEVICE_WACOM(0xE6) },
>   	{ USB_DEVICE_WACOM(0x47) },
>   	{ }
>   };

Looks reasonable. Should probably add "(drop after 2.6.38)" to the 
commit subject.

Acked-by: Tim Gardner <tim.gardner@canonical.com>
Manoj Iyer - April 1, 2011, 6:56 p.m.
>
> Looks reasonable. Should probably add "(drop after 2.6.38)" to the
> commit subject.
>
> Acked-by: Tim Gardner <tim.gardner@canonical.com>

Maintainer has acked applied the patch, once it makes linus I will 
propose it for .38 (longterm) that way it will make its way into natty.
Brad Figg - April 5, 2011, 6:31 p.m.
On 03/31/2011 12:45 PM, Manoj Iyer wrote:
> Patch was submitted upstream, upstream has changed the way
> resolutions are reported, so I need to rework the upstream
> patch based on for-linus tree. Not sure when the upstrea
> patches will get merged to linus tree. More information here:
> https://lkml.org/lkml/2011/3/31/403
>
> BugLink: http://bugs.launchpad.net/bugs/746652
>
> Signed-off-by: Manoj Iyer<manoj.iyer@canonical.com>
> ---
>   drivers/input/tablet/wacom_wac.c |    3 +++
>   1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
> index 7e0581c..98067d7 100644
> --- a/drivers/input/tablet/wacom_wac.c
> +++ b/drivers/input/tablet/wacom_wac.c
> @@ -1285,6 +1285,8 @@ static const struct wacom_features wacom_features_0xE2 =
>   	{ "Wacom ISDv4 E2",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG };
>   static const struct wacom_features wacom_features_0xE3 =
>   	{ "Wacom ISDv4 E3",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG };
> +static const struct wacom_features wacom_features_0xE6 =
> +	{ "ISD-V4",       	  WACOM_PKGLEN_TPC2FG,    27760, 15694,  255,  0, TABLETPC2FG };
>   static const struct wacom_features wacom_features_0x47 =
>   	{ "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS };
>   static struct wacom_features wacom_features_0xD0 =
> @@ -1360,6 +1362,7 @@ const struct usb_device_id wacom_ids[] = {
>   	{ USB_DEVICE_WACOM(0x9F) },
>   	{ USB_DEVICE_WACOM(0xE2) },
>   	{ USB_DEVICE_WACOM(0xE3) },
> +	{ USB_DEVICE_WACOM(0xE6) },
>   	{ USB_DEVICE_WACOM(0x47) },
>   	{ }
>   };

Nice and tidy.

Acked-by: Brad Figg <brad.figg@canonical.com>

Patch

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 7e0581c..98067d7 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1285,6 +1285,8 @@  static const struct wacom_features wacom_features_0xE2 =
 	{ "Wacom ISDv4 E2",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG };
 static const struct wacom_features wacom_features_0xE3 =
 	{ "Wacom ISDv4 E3",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG };
+static const struct wacom_features wacom_features_0xE6 =
+	{ "ISD-V4",       	  WACOM_PKGLEN_TPC2FG,    27760, 15694,  255,  0, TABLETPC2FG };
 static const struct wacom_features wacom_features_0x47 =
 	{ "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS };
 static struct wacom_features wacom_features_0xD0 =
@@ -1360,6 +1362,7 @@  const struct usb_device_id wacom_ids[] = {
 	{ USB_DEVICE_WACOM(0x9F) },
 	{ USB_DEVICE_WACOM(0xE2) },
 	{ USB_DEVICE_WACOM(0xE3) },
+	{ USB_DEVICE_WACOM(0xE6) },
 	{ USB_DEVICE_WACOM(0x47) },
 	{ }
 };