From patchwork Thu Oct 22 06:01:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Lee X-Patchwork-Id: 534229 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 CD65F141317; Thu, 22 Oct 2015 17:01:51 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Zp8wa-0008BX-Rj; Thu, 22 Oct 2015 06:01:44 +0000 Received: from mail-pa0-f47.google.com ([209.85.220.47]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Zp8wW-0008BS-Pg for kernel-team@lists.ubuntu.com; Thu, 22 Oct 2015 06:01:40 +0000 Received: by pabrc13 with SMTP id rc13so77252943pab.0 for ; Wed, 21 Oct 2015 23:01:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=dropCWtSmE2T2FL5vqejQhyETjA1GffkWIrsx/L4ttc=; b=S2x7gLWiIO0G1KjuJ901flhaRuWnCSIUOYJphEDH9pzEK01Jv8JbrPj2MEu+EyGX9r 28M8qH+0e4M5xNhwSTErL7qpJcJ//WSGekZeDwQ05+AelnDUOuzKVlY6BsQ91NkLvAV7 egvdGpSvV8h7HcIeFOjaMoz/KliJhZOJg1vnbcy/r5hknigCUXOmhZGYWH8Wc5zc6wFR xTB6MldoCswro2yZdf24mL2rwdCtk6UhVl3AjyiSIxeWjoR+7fx17oIiOUDTipX2TGcj xeg7xqXXgYLVx2J0coFRbec55xu9PP+G0pHaEFhO8qVyF4VsZ9LuZXCwvmbjhulCgd9I j+xw== X-Gm-Message-State: ALoCoQkPCJh5FP41Wt+j1MTlNS6xkB+VYF60faAR849CG5AGOSOUyegXhZrjyIRmmPPhHQFUgDHg X-Received: by 10.66.163.197 with SMTP id yk5mr15022014pab.37.1445493700134; Wed, 21 Oct 2015 23:01:40 -0700 (PDT) Received: from localhost (45.78.18.205.16clouds.com. [45.78.18.205]) by smtp.gmail.com with ESMTPSA id zi1sm12225934pbc.10.2015.10.21.23.01.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2015 23:01:39 -0700 (PDT) From: Adam Lee To: kernel-team@lists.ubuntu.com Subject: [PATCH][Vivid] Bluetooth: btusb: Support QCA61x4 ROME v2.0 Date: Thu, 22 Oct 2015 14:01:32 +0800 Message-Id: <1445493692-8874-1-git-send-email-adam.lee@canonical.com> X-Mailer: git-send-email 2.6.1 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 From: Chan-yeol Park Buglink: https://bugs.launchpad.net/bugs/1477872 The previous commit(3267c88) missed QCA61x4 ROME v2.0 info on Samsung so its BT is not activated and the below message is shown. [ 8.009638] usb 1-1: New USB device found, idVendor=0cf3, idProduct=e300 [ 8.012637] usb 1-1: New USB device strings: Mfr=0, Product=0, SerialNumber=0 [ 8.102901] Bluetooth: hci0: don't support firmware rome 0x200 This patch adds QCA61x4 ROME v2.0 info in qca_devices_table[], and is verified on Samsung with the firmware provided by Kim, Ben Young Tae . T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0cf3 ProdID=e300 Rev= 0.01 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 E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms Signed-off-by: Chan-yeol Park Signed-off-by: Marcel Holtmann (cherry picked from commit 7f6e63631dbd7fd6689b4ee301d0eea0f34c5535) Signed-off-by: Adam Lee --- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 11e9d8f..ec4bd1f 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2034,6 +2034,7 @@ struct qca_device_info { static const struct qca_device_info qca_devices_table[] = { { 0x00000100, 20, 4, 10 }, /* Rome 1.0 */ { 0x00000101, 20, 4, 10 }, /* Rome 1.1 */ + { 0x00000200, 28, 4, 18 }, /* Rome 2.0 */ { 0x00000201, 28, 4, 18 }, /* Rome 2.1 */ { 0x00000300, 28, 4, 18 }, /* Rome 3.0 */ { 0x00000302, 28, 4, 18 }, /* Rome 3.2 */