Skip to content

Commit a5f3fa7

Browse files
NeerajSanjayKaleVudentz
authored andcommitted
Bluetooth: btnxpuart: Rename IW615 to IW610
This changes the chip name of IW615 to IW610. IW610 (formerly called IW615) is yet to be released to broad market, hence there is no issue of backward compatibility. Signed-off-by: Neeraj Sanjay Kale <[email protected]> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
1 parent 0d439d9 commit a5f3fa7

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/bluetooth/btnxpuart.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
#define FIRMWARE_IW416 "uartiw416_bt.bin"
4444
#define FIRMWARE_IW416_OLD "uartiw416_bt_v0.bin"
4545
#define FIRMWARE_IW612 "uartspi_n61x_v1.bin.se"
46-
#define FIRMWARE_IW615 "uartspi_iw610.bin"
47-
#define FIRMWARE_SECURE_IW615 "uartspi_iw610.bin.se"
46+
#define FIRMWARE_IW610 "uartspi_iw610.bin"
47+
#define FIRMWARE_SECURE_IW610 "uartspi_iw610.bin.se"
4848
#define FIRMWARE_IW624 "uartiw624_bt.bin"
4949
#define FIRMWARE_SECURE_IW624 "uartiw624_bt.bin.se"
5050
#define FIRMWARE_AW693 "uartaw693_bt.bin"
@@ -60,8 +60,8 @@
6060
#define CHIP_ID_IW624c 0x8001
6161
#define CHIP_ID_AW693a0 0x8200
6262
#define CHIP_ID_AW693a1 0x8201
63-
#define CHIP_ID_IW615a0 0x8800
64-
#define CHIP_ID_IW615a1 0x8801
63+
#define CHIP_ID_IW610a0 0x8800
64+
#define CHIP_ID_IW610a1 0x8801
6565

6666
#define FW_SECURE_MASK 0xc0
6767
#define FW_OPEN 0x00
@@ -947,12 +947,12 @@ static char *nxp_get_fw_name_from_chipid(struct hci_dev *hdev, u16 chipid,
947947
else
948948
bt_dev_err(hdev, "Illegal loader version %02x", loader_ver);
949949
break;
950-
case CHIP_ID_IW615a0:
951-
case CHIP_ID_IW615a1:
950+
case CHIP_ID_IW610a0:
951+
case CHIP_ID_IW610a1:
952952
if ((loader_ver & FW_SECURE_MASK) == FW_OPEN)
953-
fw_name = FIRMWARE_IW615;
953+
fw_name = FIRMWARE_IW610;
954954
else if ((loader_ver & FW_SECURE_MASK) != FW_AUTH_ILLEGAL)
955-
fw_name = FIRMWARE_SECURE_IW615;
955+
fw_name = FIRMWARE_SECURE_IW610;
956956
else
957957
bt_dev_err(hdev, "Illegal loader version %02x", loader_ver);
958958
break;

0 commit comments

Comments
 (0)