From patchwork Tue Aug 27 03:39:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 270015 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 2DF652C00A6 for ; Tue, 27 Aug 2013 13:40:08 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VEA8P-00040L-4x; Tue, 27 Aug 2013 03:40:01 +0000 Received: from mail-pb0-f47.google.com ([209.85.160.47]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VEA8H-0003z3-Ts for kernel-team@lists.ubuntu.com; Tue, 27 Aug 2013 03:39:54 +0000 Received: by mail-pb0-f47.google.com with SMTP id rr4so4231678pbb.20 for ; Mon, 26 Aug 2013 20:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=xnmeTJMOoiOe0bQ/2LO/McbinMu23JSr06spPzc08zY=; b=DmmtByLM1SCn15ov9rkV35MmIeIZCwuqgxdQvk4wudjB7QJ/vLDyAAsPKrQWNHLv1i u5rxiqp6B3wW3kqrvAH1mVDPsiYZByUJKN0CW/48xAaYhOESDVfChczY/v9Y7k+3xTFp CDYgRbT0uRRAuKPyoz5aXo/0b3X614FgTy+OetmMl9wTjdagyZfvlLG9N7qzu+QXD+TT bjV50EnDsAJEgCXVD7hl2oFe8gNPM/IfSX0FHY0xEGtxS3oKVHg1qJh1eUwPFQ0KEYqt r2ztaa7Te5lhPRIhIuY/RVq2WFeU2nKU/tDRkM1upTSDnKFi5TdDCzYrP53inj5jandj rUNQ== X-Received: by 10.66.161.38 with SMTP id xp6mr6461460pab.145.1377574792915; Mon, 26 Aug 2013 20:39:52 -0700 (PDT) Received: from localhost ([175.41.48.77]) by mx.google.com with ESMTPSA id fk4sm23658058pab.23.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 26 Aug 2013 20:39:51 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH] Bluetooth: Add support for Atheros [0cf3:3121] Date: Tue, 27 Aug 2013 11:39:42 +0800 Message-Id: <1377574782-14431-2-git-send-email-acelan.kao@canonical.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1377574782-14431-1-git-send-email-acelan.kao@canonical.com> References: <1377574782-14431-1-git-send-email-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1202477 Add support for the AR3012 chip. T: Bus=03 Lev=01 Prnt=01 Port=06 Cnt=01 Dev#= 6 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0cf3 ProdID=3121 Rev=00.02 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb Signed-off-by: AceLan Kao Signed-off-by: Gustavo Padovan (backported from commit 1ebd0b21ab14efb75950079840eac29afea2a26e) Signed-off-by: AceLan Kao Conflicts: drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c Acked-by: Andy Whitcroft --- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+) diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index 8af01c1..47b0f70 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c @@ -90,6 +90,7 @@ static struct usb_device_id ath3k_table[] = { { USB_DEVICE(0x13d3, 0x3393) }, { USB_DEVICE(0x0489, 0xe04e) }, { USB_DEVICE(0x0489, 0xe056) }, + { USB_DEVICE(0x0cf3, 0x3121) }, /* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xE02C) }, @@ -126,6 +127,7 @@ static struct usb_device_id ath3k_blist_tbl[] = { { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 }, /* Atheros AR5BBU22 with sflash firmware */ { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 }, diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index db16ce3..09fff25 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -166,6 +166,7 @@ static struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 }, /* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },