Bluetooth: btnxpuart: Drop _v0 suffix from FW names

This updates all FW names by dropping the _v0 suffix.
Its been decided that all NXP BT/ WiFi FW names won't support _v0 suffix.
The suffix would be kept for next HW versions such as v1, v2 and so on,
which do not have backward compatible FW.

This change affects W8987, IW416 and IW615 chipsets, out of which new FW
files for W8987 and IW615 are yet to be released to broad market.

For IW416, old and new FW names are added to maintain backward
compatibility for existing customers.

Signed-off-by: Neeraj Sanjay Kale <neeraj.sanjaykale@nxp.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/btnxpuart.c b/drivers/bluetooth/btnxpuart.c
index 5ea0d23e88c02ba33b14b6caa0a96b890b744255..6ef199ce2f6190291a8b5c618282f9a5199fe89c 100644 (file)
--- a/drivers/bluetooth/btnxpuart.c
+++ b/drivers/bluetooth/btnxpuart.c
@@ -34,16 +34,17 @@
 /* NXP HW err codes */
 #define BTNXPUART_IR_HW_ERR            0xb0
 
-#define FIRMWARE_W8987         "uart8987_bt_v0.bin"
+#define FIRMWARE_W8987         "uart8987_bt.bin"
 #define FIRMWARE_W8987_OLD     "uartuart8987_bt.bin"
 #define FIRMWARE_W8997         "uart8997_bt_v4.bin"
 #define FIRMWARE_W8997_OLD     "uartuart8997_bt_v4.bin"
 #define FIRMWARE_W9098         "uart9098_bt_v1.bin"
 #define FIRMWARE_W9098_OLD     "uartuart9098_bt_v1.bin"
-#define FIRMWARE_IW416         "uartiw416_bt_v0.bin"
+#define FIRMWARE_IW416         "uartiw416_bt.bin"
+#define FIRMWARE_IW416_OLD     "uartiw416_bt_v0.bin"
 #define FIRMWARE_IW612         "uartspi_n61x_v1.bin.se"
-#define FIRMWARE_IW615         "uartspi_iw610_v0.bin"
-#define FIRMWARE_SECURE_IW615  "uartspi_iw610_v0.bin.se"
+#define FIRMWARE_IW615         "uartspi_iw610.bin"
+#define FIRMWARE_SECURE_IW615  "uartspi_iw610.bin.se"
 #define FIRMWARE_IW624         "uartiw624_bt.bin"
 #define FIRMWARE_SECURE_IW624  "uartiw624_bt.bin.se"
 #define FIRMWARE_AW693         "uartaw693_bt.bin"
@@ -971,6 +972,9 @@ static char *nxp_get_old_fw_name_from_chipid(struct hci_dev *hdev, u16 chipid,
        case CHIP_ID_W9098:
                fw_name_old = FIRMWARE_W9098_OLD;
                break;
+       case CHIP_ID_IW416:
+               fw_name_old = FIRMWARE_IW416_OLD;
+               break;
        }
        return fw_name_old;
 }