From patchwork Fri Oct 1 11:26:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pascal Auriel - Stantum X-Patchwork-Id: 223252 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o91BVqtg010036 for ; Fri, 1 Oct 2010 11:31:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756513Ab0JALbv (ORCPT ); Fri, 1 Oct 2010 07:31:51 -0400 Received: from reverse.completel.net ([92.103.162.83]:52909 "EHLO mail.stantum.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1756472Ab0JALbv (ORCPT ); Fri, 1 Oct 2010 07:31:51 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 01 Oct 2010 11:31:52 +0000 (UTC) X-Greylist: delayed 327 seconds by postgrey-1.27 at vger.kernel.org; Fri, 01 Oct 2010 07:31:50 EDT Received: from stantum-exch.stantum.local ([10.0.0.247]) by stantum-exch.stantum.local ([10.0.0.247]) with mapi; Fri, 1 Oct 2010 13:26:21 +0200 From: Pascal Auriel - Stantum To: "linux-input@vger.kernel.org" CC: "jkosina@suse.cz" , "chatty@enac.fr" , Gowri Ries - Stantum , Pascal Auriel - Stantum Date: Fri, 1 Oct 2010 13:26:17 +0200 Subject: [PATCH] hid: support STmicroelectronics and Sitronix with hid-stantuml driver Thread-Topic: [PATCH] hid: support STmicroelectronics and Sitronix with hid-stantuml driver Thread-Index: ActhW3amP6a1+3y2Quuh03+wfunhjA== Message-ID: <39DA9B419B56B14AB97E543A876B0ECF195F57B883@stantum-exch.stantum.local> Accept-Language: fr-FR Content-Language: fr-FR X-MS-Has-Attach: yes X-MS-TNEF-Correlator: acceptlanguage: fr-FR MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff -rupN before/drivers/hid/hid-core.c after/drivers/hid/hid-core.c --- before/drivers/hid/hid-core.c 2010-10-01 13:01:34.485323002 +0200 +++ after/drivers/hid/hid-core.c 2010-10-01 13:04:23.869323000 +0200 @@ -1376,6 +1376,8 @@ static const struct hid_device_id hid_bl { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) }, + { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM, USB_DEVICE_ID_MTP_STM) }, + { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX, USB_DEVICE_ID_MTP_SITRONIX) }, { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) }, diff -rupN before/drivers/hid/hid-ids.h after/drivers/hid/hid-ids.h --- before/drivers/hid/hid-ids.h 2010-10-01 13:01:47.085323001 +0200 +++ after/drivers/hid/hid-ids.h 2010-10-01 13:04:33.285323000 +0200 @@ -481,6 +481,12 @@ #define USB_VENDOR_ID_STANTUM 0x1f87 #define USB_DEVICE_ID_MTP 0x0002 +#define USB_VENDOR_ID_STANTUM_STM 0x0483 +#define USB_DEVICE_ID_MTP_STM 0x3261 + +#define USB_VENDOR_ID_STANTUM_SITRONIX 0x1403 +#define USB_DEVICE_ID_MTP_SITRONIX 0x5001 + #define USB_VENDOR_ID_SUN 0x0430 #define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab diff -rupN before/drivers/hid/hid-stantum.c after/drivers/hid/hid-stantum.c --- before/drivers/hid/hid-stantum.c 2010-10-01 13:01:40.181323000 +0200 +++ after/drivers/hid/hid-stantum.c 2010-10-01 13:04:43.717323001 +0200 @@ -249,6 +249,8 @@ static void stantum_remove(struct hid_de static const struct hid_device_id stantum_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) }, + { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM, USB_DEVICE_ID_MTP_STM) }, + { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX, USB_DEVICE_ID_MTP_SITRONIX) }, { } }; MODULE_DEVICE_TABLE(hid, stantum_devices);