[PATCH][Vivid] Bluetooth: btusb: Support QCA61x4 ROME v2.0

[Hui Wang]

On 11/11/2015 05:06 PM, Luis Henriques wrote:
> On Wed, Nov 11, 2015 at 03:35:21PM +0800, hwang4 wrote:
>>
>> On 2015年10月22日 16:46, Stefan Bader wrote:
>>> On 22.10.2015 08:01, Adam Lee wrote:
>>>> From: Chan-yeol Park <chanyeol.park at samsung.com>
>>>>
>>>> Buglink: https://bugs.launchpad.net/bugs/1477872
>>> In the bug you nominated wily only. Should that be vivid or wily or both?
>>>
>>> -Stefan
>> Hi Stefan,
>>
>> Today I checked the ubuntu-vivid.git but did not find this patch.
>>
> You probably checked only the master branch -- this patch is in the
> vivid git repository, but still in the master-next branch.  The SRU
> cycle that starts this week should include it in the next kernel.
>
> Cheers,
> --
> Luís
>
OK, got it, thank you very much.


>>>> 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
>>>> <ytkim at qca.qualcomm.com>.
>>>>
>>>> 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 <chanyeol.park at samsung.com>
>>>> Signed-off-by: Marcel Holtmann <marcel at holtmann.org>
>>>> (cherry picked from commit 7f6e63631dbd7fd6689b4ee301d0eea0f34c5535)
>>>> Signed-off-by: Adam Lee <adam.lee at canonical.com>
>>>> ---
>>>>   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 */
>>>>
>>>
>>>
>> -- 
>> kernel-team mailing list
>> kernel-team at lists.ubuntu.com
>> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>