Expand the firmware-name property to specify the names of NVM and rampatch firmware to load. This update will support loading specific firmware (nvm and rampatch) for certain chips, like the QCA6698 Bluetooth chip, which shares the same IP core as the WCN6855 but has different RF components and RAM sizes, requiring new firmware files. Different connectivity boards may be attached to the same platform. For example, QCA6698-based boards can support either a two-antenna or three-antenna solution, both of which work on the sa8775p-ride platform. Due to differences in connectivity boards and variations in RF performance from different foundries, different NVM configurations are used based on the board ID. So In firmware-name, if the NVM file has an extension, the NVM file will be used. Otherwise, the system will first try the .bNN (board ID) file, and if that fails, it will fall back to the .bin file. Possible configurations: firmware-name = "QCA6698/hpnv21.bin", "QCA6698/hpbtfw21.tlv"; firmware-name = "QCA6698/hpnv21", "QCA6698/hpbtfw21.tlv"; firmware-name = "QCA6698/hpnv21.bin"; --- v6: - Pick up Acked-by Krzysztof Kozlowski for dt-bindings - Fix type error in btqca.c - Optimize the have-suffix function - Seperate the sa8775p-ride.dtsi change to another patch - Link to v5: https://lore.kernel.org/all/20241212150232.3823088-1-quic_chejiang@xxxxxxxxxxx/ v5: - Update the dt-bindings decription. - Extract the have-suffix check code to a helper function. - Merge three generate nvm name functions to a signle function. - Link to v4: https://lore.kernel.org/all/20241210151636.2474809-1-quic_chejiang@xxxxxxxxxxx/ v4: - Split nvm and rampatch changes to 2 commits. - Fix the dt_binding_check error. - Change the qca_get_alt_nvm_path return type from int to bool. - Fix the nvm name suffix check error when path has '.'. - Optimize the nvm file name generation function. - Link to v3: https://lore.kernel.org/all/20241205102213.1281865-1-quic_chejiang@xxxxxxxxxxx/ v3: - Expand firmware-name property to specify the nvm and rampatch to load. - Change the driver to support two items in firmware-name and choose the NVM file according to board id if there is no extension in NVM file. - Update the dts file to idendify the firmware for QCA6698. --- Cheng Jiang (3): dt-bindings: net: bluetooth: qca: Expand firmware-name property Bluetooth: qca: Update firmware-name to support board specific nvm Bluetooth: qca: Expand firmware-name to load specific rampatch .../net/bluetooth/qualcomm-bluetooth.yaml | 5 +- drivers/bluetooth/btqca.c | 195 ++++++++++++------ drivers/bluetooth/btqca.h | 5 +- drivers/bluetooth/hci_qca.c | 22 +- 4 files changed, 152 insertions(+), 75 deletions(-) base-commit: fdb298fa865b0136f7be842e6c2e6310dede421a -- 2.34.1