From patchwork Fri Oct 7 19:39:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roderick Colenbrander X-Patchwork-Id: 9367441 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 5A73C600C8 for ; Fri, 7 Oct 2016 19:40:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49A2C297EE for ; Fri, 7 Oct 2016 19:40:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DC1729832; Fri, 7 Oct 2016 19:40:21 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM,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 D6C60297EE for ; Fri, 7 Oct 2016 19:40:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932574AbcJGTkU (ORCPT ); Fri, 7 Oct 2016 15:40:20 -0400 Received: from mail-it0-f53.google.com ([209.85.214.53]:36932 "EHLO mail-it0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932565AbcJGTkT (ORCPT ); Fri, 7 Oct 2016 15:40:19 -0400 Received: by mail-it0-f53.google.com with SMTP id z65so17490999itc.0 for ; Fri, 07 Oct 2016 12:40:19 -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:in-reply-to:references; bh=pBEEH8VbwJ4RDXwEHNPyAM8NoIQnmGGzoDKXlhhGRzk=; b=bXcqlg4ppGa0G/VXjVQbv+cG9S3GvbDCrHze0051jRzGk1fmXxTC/PwI74J0MaBAEK mj3u2a3vK5wRd85MZ4B79DMChxGX6TQylnHc0b1/ZbuhAqwgZOTDQQFIX3IsMMl3X05F WSB38dgfqZx+M3+C9b0gSDcGLXxSk7r3YomiMCwmO5IXU7uJwY98EuJceHXh8YNVtxPR 2CihMEjVhAyGpgIsPHFIW7kEmFCuK0/uV7xF/8D+nOnIlsbjJ83sFJmFTvODQNeEzkv8 FbANrxVwLB6RfnRM4ToO6ExiMlQEgs5okc6Eoy4v5hwbW0B3hCmV1fvWiugcXEU3IbdY a2xg== 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:in-reply-to :references; bh=pBEEH8VbwJ4RDXwEHNPyAM8NoIQnmGGzoDKXlhhGRzk=; b=YctVt92b8ksyJT4ZES7Je9CD0YQ8kidOCXyAsd+0YRjYukKeG5RFlTL1CnIvZNLzmB d9+iuiLto+GWdsXozU87NNbxqAUzx/QHyjK0+xF6f3txaRbIVcJMnTym+3e3cHNtK5mP ONFSKsJ9fWUZWLYFLUlu3IDa1AUbJC7tXPa/RIoljR+s7EyHcjBQNQSpsdf6LIlBawB3 0daaMWBSBDSPocRyNWAdl+dVgpMx2ADRLCw3nE4Q3ys0eSSZPQJfMQG3zsu7TaophS4h P64eOcLCa2mAtRRGNqDBkAhjaATbSvBk+RVylLG2u3+6LJTcOR9H+3Dexdh5e3pbhzlw y64A== X-Gm-Message-State: AA6/9RkzeKusQkvZpmZfgcoV1v9N39ZtETHN41I4BfDSRB+okjLZEmadmGe8V5RhLN5QPjPm X-Received: by 10.36.150.70 with SMTP id z67mr370684itd.80.1475869218538; Fri, 07 Oct 2016 12:40:18 -0700 (PDT) Received: from konan1.dev.biz ([100.42.98.197]) by smtp.gmail.com with ESMTPSA id v7sm1735481itd.6.2016.10.07.12.40.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Oct 2016 12:40:18 -0700 (PDT) From: Roderick Colenbrander To: linux-input@vger.kernel.org Cc: Benjamin Tissoires , Jiri Kosina , Tim Bird , Roderick Colenbrander Subject: [PATCH v3 7/7] HID: sony: Update device ids Date: Fri, 7 Oct 2016 12:39:40 -0700 Message-Id: <1475869180-26757-8-git-send-email-roderick@gaikai.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475869180-26757-1-git-send-email-roderick@gaikai.com> References: <1475869180-26757-1-git-send-email-roderick@gaikai.com> 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 --- 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 bd84790..14763cd 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -2641,6 +2641,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 },