summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrishna Reddy <vdumpa@nvidia.com>2010-01-15 21:17:06 -0500
committerKrishna Reddy <vdumpa@nvidia.com>2010-01-15 21:17:06 -0500
commita644a4ae84e7b7ebe35532e4b8d373efe939e6de (patch)
tree95719cd2898904ca34a8011d3855f2ea69f05c72
parentc48ba07063fa2868db534416cf319b56bc26cb18 (diff)
linux kernel:Added new product id for PANJIT touch screen.
Added the new product id in the usb id table, for PANJIT touch screen to work. Enabled the PANJIT touch screen in the harmony config file. Change-Id: I9914622fb4fe697f2cb7ede0d033aa46578c7d4b
-rw-r--r--arch/arm/configs/tegra_harmony_android_defconfig2
-rw-r--r--drivers/input/touchscreen/usbtouchscreen.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/tegra_harmony_android_defconfig b/arch/arm/configs/tegra_harmony_android_defconfig
index 3a3156fa0dd6..3ce91717812a 100644
--- a/arch/arm/configs/tegra_harmony_android_defconfig
+++ b/arch/arm/configs/tegra_harmony_android_defconfig
@@ -758,7 +758,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
CONFIG_TOUCHSCREEN_USB_COMPOSITE=y
CONFIG_TOUCHSCREEN_USB_EGALAX=y
-# CONFIG_TOUCHSCREEN_USB_PANJIT is not set
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
# CONFIG_TOUCHSCREEN_USB_3M is not set
# CONFIG_TOUCHSCREEN_USB_ITM is not set
# CONFIG_TOUCHSCREEN_USB_ETURBO is not set
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index fb7cb9bdfbd5..8207332042b8 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -150,6 +150,7 @@ static struct usb_device_id usbtouch_devices[] = {
{USB_DEVICE(0x134c, 0x0002), .driver_info = DEVTYPE_PANJIT},
{USB_DEVICE(0x134c, 0x0003), .driver_info = DEVTYPE_PANJIT},
{USB_DEVICE(0x134c, 0x0004), .driver_info = DEVTYPE_PANJIT},
+ {USB_DEVICE(0x134c, 0x0100), .driver_info = DEVTYPE_PANJIT},
#endif
#ifdef CONFIG_TOUCHSCREEN_USB_3M