Bluetooth: sort the list of IDs in the source code
PATCH 1/2 Bluetooth: sort the list of IDs in the source code
This will help to manage table of supported IDs.
There is no functional change.
--- drivers/bluetooth/ath3k.c | 78 +++++++++++++++++++++++------------------------ drivers/bluetooth/btusb.c | 52 +++++++++++++++---------------- 2 files changed, 65 insertions(+), 65 deletions(-)
drivers/bluetooth/ath3k.c +39 -39
@@ -62,52 +62,52 @@ static const struct usb_device_id ath3k_table[] = { { USB_DEVICE(0x0CF3, 0x3000) },/* Atheros AR3011 with sflash firmware*/ + { USB_DEVICE(0x0489, 0xE027) }, + { USB_DEVICE(0x0489, 0xE03D) }, + { USB_DEVICE(0x0930, 0x0215) }, { USB_DEVICE(0x0CF3, 0x3002) }, { USB_DEVICE(0x0CF3, 0xE019) }, { USB_DEVICE(0x13d3, 0x3304) }, - { USB_DEVICE(0x0930, 0x0215) }, - { USB_DEVICE(0x0489, 0xE03D) }, - { USB_DEVICE(0x0489, 0xE027) },/* Atheros AR9285 Malbec with sflash firmware */ { USB_DEVICE(0x03F0, 0x311D) },/* Atheros AR3012 with sflash firmware*/ + { USB_DEVICE(0x0489, 0xe04d) }, + { USB_DEVICE(0x0489, 0xe04e) }, + { USB_DEVICE(0x0489, 0xe057) }, + { USB_DEVICE(0x0489, 0xe056) }, + { USB_DEVICE(0x0489, 0xe05f) }, + { USB_DEVICE(0x04c5, 0x1330) }, + { USB_DEVICE(0x04CA, 0x3004) }, + { USB_DEVICE(0x04CA, 0x3005) }, + { USB_DEVICE(0x04CA, 0x3006) }, + { USB_DEVICE(0x04CA, 0x3008) }, + { USB_DEVICE(0x04CA, 0x300b) }, + { USB_DEVICE(0x0930, 0x0219) }, + { USB_DEVICE(0x0930, 0x0220) }, { USB_DEVICE(0x0CF3, 0x0036) }, { USB_DEVICE(0x0CF3, 0x3004) }, { USB_DEVICE(0x0CF3, 0x3008) }, { USB_DEVICE(0x0CF3, 0x311D) }, { USB_DEVICE(0x0CF3, 0x311E) }, { USB_DEVICE(0x0CF3, 0x311F) }, + { USB_DEVICE(0x0cf3, 0x3121) }, { USB_DEVICE(0x0CF3, 0x817a) }, - { USB_DEVICE(0x13d3, 0x3375) }, - { USB_DEVICE(0x04CA, 0x3004) }, - { USB_DEVICE(0x04CA, 0x3005) }, - { USB_DEVICE(0x04CA, 0x3006) }, - { USB_DEVICE(0x04CA, 0x3008) }, - { USB_DEVICE(0x04CA, 0x300b) }, - { USB_DEVICE(0x13d3, 0x3362) }, + { USB_DEVICE(0x0cf3, 0xe003) }, { USB_DEVICE(0x0CF3, 0xE004) }, { USB_DEVICE(0x0CF3, 0xE005) }, - { USB_DEVICE(0x0930, 0x0219) }, - { USB_DEVICE(0x0930, 0x0220) }, - { USB_DEVICE(0x0489, 0xe057) }, + { USB_DEVICE(0x13d3, 0x3362) }, + { USB_DEVICE(0x13d3, 0x3375) }, { USB_DEVICE(0x13d3, 0x3393) }, - { USB_DEVICE(0x0489, 0xe04e) }, - { USB_DEVICE(0x0489, 0xe056) }, - { USB_DEVICE(0x0489, 0xe04d) }, - { USB_DEVICE(0x04c5, 0x1330) }, { USB_DEVICE(0x13d3, 0x3402) }, - { USB_DEVICE(0x0cf3, 0x3121) }, - { USB_DEVICE(0x0cf3, 0xe003) }, - { USB_DEVICE(0x0489, 0xe05f) },/* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xE02C) },/* Atheros AR5BBU22 with sflash firmware */ - { USB_DEVICE(0x0489, 0xE03C) }, { USB_DEVICE(0x0489, 0xE036) }, + { USB_DEVICE(0x0489, 0xE03C) }, { } /* Terminating entry */ };
@@ -120,38 +120,38 @@ MODULE_DEVICE_TABLE(usb, ath3k_table);static const struct usb_device_id ath3k_blist_tbl[] = {/* Atheros AR3012 with sflash firmware*/ + {USB_DEVICE (0x0489 ,0xe04e ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0489 ,0xe04d ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0489 ,0xe056 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0489 ,0xe057 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0489 ,0xe05f ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04c5 ,0x1330 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04ca ,0x3004 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04ca ,0x3005 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04ca ,0x3006 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04ca ,0x3008 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04ca ,0x300b ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0930 ,0x0219 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0930 ,0x0220 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0CF3 ,0x0036 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0x3004 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0x3008 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0x311D ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0x311E ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0x311F ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0cf3 ,0x3121 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0CF3 ,0x817a ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x13d3 ,0x3375 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04ca ,0x3004 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04ca ,0x3005 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04ca ,0x3006 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04ca ,0x3008 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04ca ,0x300b ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x13d3 ,0x3362 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0xe004 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0xe005 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0930 ,0x0219 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0930 ,0x0220 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0489 ,0xe057 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0cf3 ,0xe003 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x13d3 ,0x3362 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x13d3 ,0x3375 ), .driver_info =BTUSB_ATH3012 }, {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 (0x0489 ,0xe04d ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04c5 ,0x1330 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x13d3 ,0x3402 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0cf3 ,0x3121 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0cf3 ,0xe003 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0489 ,0xe05f ), .driver_info =BTUSB_ATH3012 },/* Atheros AR5BBU22 with sflash firmware */ - {USB_DEVICE (0x0489 ,0xE03C ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0489 ,0xE036 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0489 ,0xE03C ), .driver_info =BTUSB_ATH3012 }, { }/* Terminating entry */ };
drivers/bluetooth/btusb.c +26 -26
99 lines not on this page · raw message
Signature · 1 line
1.9.0.rc3
PATCH 2/2 Bluetooth: append new supported device to the list [0b05:17d0]
The device found on Asus Z87 Expert motherboard requires firmware to work correctly.
T: Bus=03 Lev=01 Prnt=01 Port=03 Cnt=02 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0b05 ProdID=17d0 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
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -86,6 +86,7 @@ static const struct usb_device_id ath3k_table[] = { { USB_DEVICE(0x04CA, 0x300b) }, { USB_DEVICE(0x0930, 0x0219) }, { USB_DEVICE(0x0930, 0x0220) }, + { USB_DEVICE(0x0b05, 0x17d0) }, { USB_DEVICE(0x0CF3, 0x0036) }, { USB_DEVICE(0x0CF3, 0x3004) }, { USB_DEVICE(0x0CF3, 0x3008) },
@@ -133,6 +134,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -156,6 +156,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
Signature · 1 line
1.9.0.rc3
Marcel Holtmann
maintainerRe: [PATCH 2/2] Bluetooth: append new supported device to the list [0b05:17d0]
Hi Andy,
Quoted 10 lines
The device found on Asus Z87 Expert motherboard requires firmware to work correctly.
T: Bus=03 Lev=01 Prnt=01 Port=03 Cnt=02 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0b05 ProdID=17d0 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
Quoted 5 lines
Signed-off-by Andy Shevchenko <[email protected]>---
drivers/bluetooth/ath3k.c| 2 ++drivers/bluetooth/btusb.c| 1 +2 files changed, 3 insertions(+)
patch has been applied to bluetooth-next tree.
Regards
Marcel
Marcel Holtmann
maintainerHi Andy,
Quoted 9 lines
This will help to manage table of supported IDs.
There is no functional change.
Signed-off-by Andy Shevchenko <[email protected]>---
drivers/bluetooth/ath3k.c| 78 +++++++++++++++++++++++------------------------drivers/bluetooth/btusb.c| 52 +++++++++++++++----------------2 files changed, 65 insertions(+), 65 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel