From patchwork Wed Aug 8 01:40:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: ??? X-Patchwork-Id: 1291611 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A25C5DF280 for ; Wed, 8 Aug 2012 01:39:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751662Ab2HHBjd (ORCPT ); Tue, 7 Aug 2012 21:39:33 -0400 Received: from emcscan.emc.com.tw ([192.72.220.5]:63697 "EHLO emcscan.emc.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751121Ab2HHBjc (ORCPT ); Tue, 7 Aug 2012 21:39:32 -0400 Received: from unknown (HELO emc.com.tw) ([192.168.10.1]) by emcscan.emc.com.tw with ESMTP; 08 Aug 2012 09:39:30 +0800 Received: from localhost ([192.168.131.101]) by emc.com.tw (8.13.7+Sun/8.13.7) with ESMTP id q781dS4Q008146; Wed, 8 Aug 2012 09:39:28 +0800 (CST) From: Scott Liu To: "benjamin.tissoires" , Dmitry Torokhov , Jiri Kosina , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, eleghost@gmail.com Cc: Scott Liu Subject: [PATCH] hid:hid-multitouch: add mt_resume for ELAN's production Date: Wed, 8 Aug 2012 09:40:33 +0800 Message-Id: <1344390033-14139-1-git-send-email-scott.liu@emc.com.tw> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Some of ELAN’s production need to issue set_idle when resume. Signed-off-by: Scott Liu --- drivers/hid/hid-ids.h | 3 +++ drivers/hid/hid-multitouch.c | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 41c34f2..703aaed 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -829,4 +829,7 @@ #define USB_VENDOR_ID_PRIMAX 0x0461 #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 +#define USB_VENDOR_ID_ELAN 0x04f3 +#define USB_DEVICE_ID_ELAN_MOCCA 0x000a + #endif diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 59c8b5c..a086a16 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -767,6 +767,31 @@ static int mt_reset_resume(struct hid_device *hdev) mt_set_input_mode(hdev); return 0; } + +static int mt_resume(struct hid_device *hdev) +{ + struct usb_interface *intf = to_usb_interface(hdev->dev.parent); + struct usb_host_interface *interface = intf->cur_altsetting; + + struct usb_device *dev = hid_to_usb_dev(hdev); + + if (hdev->vendor == USB_VENDOR_ID_ELAN && + hdev->product == USB_DEVICE_ID_ELAN_MOCCA) { + + usb_control_msg(dev, + usb_sndctrlpipe(dev, 0), + HID_REQ_SET_IDLE, + USB_TYPE_CLASS | USB_RECIP_INTERFACE, + 0, + interface->desc.bInterfaceNumber, + NULL, + 0, + USB_CTRL_SET_TIMEOUT); + } + + return 0; +} + #endif static void mt_remove(struct hid_device *hdev) @@ -1092,6 +1117,7 @@ static struct hid_driver mt_driver = { .event = mt_event, #ifdef CONFIG_PM .reset_resume = mt_reset_resume, + .resume=mt_resume, #endif };