From patchwork Thu Oct 6 18:51:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roderick Colenbrander X-Patchwork-Id: 9365239 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0B9C6600C8 for ; Thu, 6 Oct 2016 18:52:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 016512920C for ; Thu, 6 Oct 2016 18:52:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA33B29218; Thu, 6 Oct 2016 18:52:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UPPERCASE_50_75 autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2AC02920C for ; Thu, 6 Oct 2016 18:52:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933813AbcJFSwM (ORCPT ); Thu, 6 Oct 2016 14:52:12 -0400 Received: from mail-io0-f169.google.com ([209.85.223.169]:34914 "EHLO mail-io0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933781AbcJFSwM (ORCPT ); Thu, 6 Oct 2016 14:52:12 -0400 Received: by mail-io0-f169.google.com with SMTP id i202so24777824ioi.2 for ; Thu, 06 Oct 2016 11:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gaikai-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=pqhMiBzqjzi8JB1OBdg1kd2FLNnWmyXjwp6GrHpDK3A=; b=GWcaCvSvS0sm0gnxuZ5yh4Z0SXKXwm9DW+j8d3F44+l7G96ok8MVgVoZWhqC9hrViU EG6ULmEXlFR6DbFW+4qttJdNKCiToWSNiAX/HcGTciTtqSWJDIaUfx04QlmHd/s2gREp Mjzf9yWxw8ZL02FjBtg7IAEPrEiC5SbFKE0YFidN6CYcg29MYw03yd5SqO/EFMCWty+A LeX8Duv2iomaYcrd+08r/yAcKVERjU+ofWmuyungr+HGCbvxAol0y7R76AC6rhu/5w+R 9Re2z8Q6TbUX3fZeYiqJycrOi2KfaMzvoLvYzcdPQKOm5embZWA7CJ8Hn4PLuDKPPScx iF8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pqhMiBzqjzi8JB1OBdg1kd2FLNnWmyXjwp6GrHpDK3A=; b=PtaZRuiUubuINe5yPNUblV8ZuDlOUyAm3SuWBAo8u60VCM3kFvhJv/fGCO+eihopQQ icceLG5JNpePwFC268LpCuF9K3W6Av9MHShhT591/oUouhl/l9hMnzMPNA+tC7kpKEV2 px/cVFu6GzxaVCkXQ1rieMm4zFHcbEzFjeTFljB4Y2VtKIigI1ghGsc4UQAxMqIydKxQ Ir04mkkxtP4atpHXbUQJXwpXFrCoVXHFQ13CaeW6gsh54mEdB6Fw8NhbQLdFuhR3mGbh 8qLcFkgdcFkDV52ks2HIq8IpUIcbKXiR5dX/CrnNuMrM0EadV9OgwGLStdKp1d6ASXyS cyHw== X-Gm-Message-State: AA6/9RmTFvgbz4fKEzaTfif7E83jlycoVivT3rry6yqvPVAmrnO1HmXGiGGDZihTDaHRgD44 X-Received: by 10.107.8.27 with SMTP id 27mr15428140ioi.162.1475779930915; Thu, 06 Oct 2016 11:52:10 -0700 (PDT) Received: from konan1.dev.biz ([100.42.98.197]) by smtp.gmail.com with ESMTPSA id r124sm14156120itc.19.2016.10.06.11.52.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Oct 2016 11:52:10 -0700 (PDT) From: Roderick Colenbrander To: linux-input@vger.kernel.org Cc: Benjamin Tissoires , Jiri Kosina , Tim Bird , Roderick Colenbrander Subject: [PATCH] HID: sony: Update device ids v2 Date: Thu, 6 Oct 2016 11:51:49 -0700 Message-Id: <1475779909-17907-1-git-send-email-roderick@gaikai.com> X-Mailer: git-send-email 2.7.4 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Roderick Colenbrander Support additional DS4 model. Signed-off-by: Roderick Colenbrander Reviewed-by: Benjamin Tissoires --- drivers/hid/hid-core.c | 2 ++ drivers/hid/hid-ids.h | 1 + drivers/hid/hid-sony.c | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 2b89c70..5ed2f57 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -2059,6 +2059,8 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) }, + { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) }, { HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index cd59c79..27f82cc 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -899,6 +899,7 @@ #define USB_DEVICE_ID_SONY_PS3_BDREMOTE 0x0306 #define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268 #define USB_DEVICE_ID_SONY_PS4_CONTROLLER 0x05c4 +#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2 0x09cc #define USB_DEVICE_ID_SONY_MOTION_CONTROLLER 0x03d5 #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002 diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index c9916cc..3acdb68 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -2639,6 +2639,10 @@ static const struct hid_device_id sony_devices[] = { .driver_data = DUALSHOCK4_CONTROLLER_USB }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER), .driver_data = DUALSHOCK4_CONTROLLER_BT }, + { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2), + .driver_data = DUALSHOCK4_CONTROLLER_USB }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2), + .driver_data = DUALSHOCK4_CONTROLLER_BT }, /* Nyko Core Controller for PS3 */ { HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER), .driver_data = SIXAXIS_CONTROLLER_USB | SINO_LITE_CONTROLLER },