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

03-31-2011, 07:45 PM

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) },
{ }
};
--
1.7.1

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

04-01-2011, 02:29 PM

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>

--
Tim Gardner tim.gardner@canonical.com

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

04-01-2011, 06:56 PM

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.

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

04-05-2011, 06:31 PM

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>

--
Brad Figg brad.figg@canonical.com http://www.canonical.com

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team