Re: [PATCH v6 09/10] ath10k: different fw file names for usb and sdio
From: Ryan Hsu <hidden>
Date: 2017-03-16 21:13:25
On 03/15/2017 08:46 AM, Kalle Valo wrote:
From: Erik Stromdahl <redacted> Since both SDIO and USB based chipsets will use different
nitpick, since the patch is separating the USB and SDIO support now, maybe = you want to remove the "USB" from the patch title?
quoted hunk ↗ jump to hunk
firmware from the PCIe and AHB chipsets, the fw file name must be different depending on bus type. The new firmware names are: For PCIe and AHB: firmware-<api_version>.bin (same as before) For SDIO: firmware-sdio-<api_version>.bin Signed-off-by: Erik Stromdahl <redacted> Signed-off-by: Kalle Valo <redacted> --- drivers/net/wireless/ath/ath10k/core.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireles=
s/ath/ath10k/core.c
quoted hunk ↗ jump to hunk
index d7fb11107df4..d2648d09a772 100644--- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c@@ -1398,7 +1398,18 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k=
*ar, const char *name,
static void ath10k_core_get_fw_name(struct ath10k *ar, char *fw_name,
size_t fw_name_len, int fw_api)
{
- scnprintf(fw_name, fw_name_len, "%s-%d.bin", ATH10K_FW_FILE_BASE, fw_ap=i);
+ switch (ar->hif.bus) {
+ case ATH10K_BUS_SDIO:
+ scnprintf(fw_name, fw_name_len, "%s-%s-%d.bin",
+ ATH10K_FW_FILE_BASE, ath10k_bus_str(ar->hif.bus),
+ fw_api);
+ break;
+ case ATH10K_BUS_PCI:
+ case ATH10K_BUS_AHB:
+ scnprintf(fw_name, fw_name_len, "%s-%d.bin",
+ ATH10K_FW_FILE_BASE, fw_api);
+ break;
+ }
}
=20
static int ath10k_core_fetch_firmware_files(struct ath10k *ar)
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k