Re: [PATCH] ath10k: advertise all possible firmware(-api) files

2014-10-08 Thread Kalle Valo
Bartosz Markowski bartosz.markow...@tieto.com writes:

 This is required if we take into account possibility to load the driver
 from initrd (RAM disk), so in other words: very early in the boot process,
 before the file system is visible.

 In such case we need to have the firmware files accessible from ram disk too,
 and this patch guarantee this.

 Signed-off-by: Bartosz Markowski bartosz.markow...@tieto.com

Thanks, applied.

-- 
Kalle Valo
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] ath10k: advertise all possible firmware(-api) files

2014-10-06 Thread Bartosz Markowski
This is required if we take into account possibility to load the driver
from initrd (RAM disk), so in other words: very early in the boot process,
before the file system is visible.

In such case we need to have the firmware files accessible from ram disk too,
and this patch guarantee this.

Signed-off-by: Bartosz Markowski bartosz.markow...@tieto.com
---
 drivers/net/wireless/ath/ath10k/hw.h  | 1 -
 drivers/net/wireless/ath/ath10k/pci.c | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/hw.h 
b/drivers/net/wireless/ath/ath10k/hw.h
index 006a9cb..6dca960 100644
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -28,7 +28,6 @@
 #define QCA988X_HW_2_0_CHIP_ID_REV 0x2
 #define QCA988X_HW_2_0_FW_DIR  ath10k/QCA988X/hw2.0
 #define QCA988X_HW_2_0_FW_FILE firmware.bin
-#define QCA988X_HW_2_0_FW_3_FILE   firmware-3.bin
 #define QCA988X_HW_2_0_OTP_FILEotp.bin
 #define QCA988X_HW_2_0_BOARD_DATA_FILE board.bin
 #define QCA988X_HW_2_0_PATCH_LOAD_ADDR 0x1234
diff --git a/drivers/net/wireless/ath/ath10k/pci.c 
b/drivers/net/wireless/ath/ath10k/pci.c
index 8a04904..730bb18 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -2600,5 +2600,7 @@ module_exit(ath10k_pci_exit);
 MODULE_AUTHOR(Qualcomm Atheros);
 MODULE_DESCRIPTION(Driver support for Atheros QCA988X PCIe devices);
 MODULE_LICENSE(Dual BSD/GPL);
-MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR / QCA988X_HW_2_0_FW_3_FILE);
+MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR / QCA988X_HW_2_0_FW_FILE);
+MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR / ATH10K_FW_API2_FILE);
+MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR / ATH10K_FW_API3_FILE);
 MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR / QCA988X_HW_2_0_BOARD_DATA_FILE);
-- 
1.8.2

--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html