From patchwork Thu Oct 6 02:18:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roderick Colenbrander X-Patchwork-Id: 9363617 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 219B1608A6 for ; Thu, 6 Oct 2016 02:20:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F3EB28D73 for ; Thu, 6 Oct 2016 02:20:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 003E228D9E; Thu, 6 Oct 2016 02:20:05 +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 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 8EAE328D73 for ; Thu, 6 Oct 2016 02:20:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752638AbcJFCUE (ORCPT ); Wed, 5 Oct 2016 22:20:04 -0400 Received: from mail-yw0-f172.google.com ([209.85.161.172]:36511 "EHLO mail-yw0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933689AbcJFCUE (ORCPT ); Wed, 5 Oct 2016 22:20:04 -0400 Received: by mail-yw0-f172.google.com with SMTP id u124so4757486ywg.3 for ; Wed, 05 Oct 2016 19:20:03 -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=LTq/kIVm76CpaJelJ00lZxOZMkpD89NoNnCjoh/Xe8U=; b=bQfFhu9koe/wUNt/SiIyFovDjC+1h4rADAzmPpc3+Q0JnfOkjsWw8ZNU36xEvEy/Th UxZhXznOjjJhZdiuIzoAYZxHI9vL4XJAS62e7Be5uz8gEbZj2RoTpZe/Xpzn+FWbvvjq xlYTLNbWw40wdG1d+G+2kCkFBgC0oECj9ZH84sxLAyJAg0bPNkavhFw1zuu55CP0avn1 FSu4PPT2Yf+6jhlVlxdkWJYXMQvYCeKT7TuIdxJOAlO9HSBF5SChmx0M1z4kKBYdQDpt wbvMkipNRrskx4XMkP2prvvt5AAnVC6DnpDh9TGaHcPeu2uqhuYtkHnXAmbd+riF1CTA uWaw== 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=LTq/kIVm76CpaJelJ00lZxOZMkpD89NoNnCjoh/Xe8U=; b=QXvK48zd/6aIbiyeYlD/KATTzF5Lz0dyPDkonGCVrHadLLztAX4/WqgwNqdnTDDY9E +s8dCH9kO/I2cAsqTYKYzIo5+NJKLZ56ZJfVLYNCo7xSKYXIbOBwd9+LAC5lm4XPKE3S C3ncd5DR+cmp/zfqlFKb7LwfknO/TOAfx7ERtGczRGYMAaoaNx2CSKEXGNpZaHqSGmOF /3h/aUk0qGghHsGmOEWilkOdYpzrwEvoN8Nq6nfcDD+Ng+llWs32bDnl/1o3K1Ux2rob 6To8qWRE1rkRFfounqaKub3uTsIfHUS6ThuAYlj3/Iq7jqAHUvmAUtI7Ssq2l0cQWr5m engw== X-Gm-Message-State: AA6/9Rm1zYE12q3fWZU4CV16fwZDiDmuSQzh20NP7bTRB7XxHWxywABUutbzCpqlN7XtSzUw X-Received: by 10.129.81.21 with SMTP id f21mr8765254ywb.149.1475720403267; Wed, 05 Oct 2016 19:20:03 -0700 (PDT) Received: from konan1.dev.biz ([100.42.98.197]) by smtp.gmail.com with ESMTPSA id i132sm213444ywc.53.2016.10.05.19.20.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Oct 2016 19:20:02 -0700 (PDT) From: Roderick Colenbrander To: linux-input@vger.kernel.org Cc: Benjamin Tissoires , Jiri Kosina , Tim Bird , Roderick Colenbrander Subject: [PATCH 2/2] HID: sony: Update device ids Date: Wed, 5 Oct 2016 19:18:55 -0700 Message-Id: <1475720335-17447-2-git-send-email-roderick@gaikai.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475720335-17447-1-git-send-email-roderick@gaikai.com> References: <1475720335-17447-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-ids.h | 1 + drivers/hid/hid-sony.c | 4 ++++ 2 files changed, 5 insertions(+) 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 },