Merge branch 'master' of git://git.marvell.com/mwifiex-firmware

Conflicts:
	WHENCE
	mrvl/sd8897_uapsta.bin
	mrvl/usb8897_uapsta.bin

Conflicts resolved with:
git checkout --theirs WHENCE
git checkout --theirs mrvl/sd8897_uapsta.bin
git checkout --theirs mrvl/usb8897_uapsta.bin

Change-Id: Ie20ea5a3e01c41495fade64325f3b0e07707d385
tree: 33cd358e255ca6bf8fd93d8d3dd4d5d5232659c6
  1. 10.1/
  2. 3com/
  3. RTL8192E/
  4. acenic/
  5. adaptec/
  6. advansys/
  7. amd-ucode/
  8. ar3k/
  9. ath10k/
  10. ath6k/
  11. av7110/
  12. bnx2/
  13. bnx2x/
  14. brcm/
  15. carl9170fw/
  16. cis/
  17. cpia2/
  18. cxgb3/
  19. cxgb4/
  20. dabusb/
  21. dsp56k/
  22. e100/
  23. edgeport/
  24. emi26/
  25. emi62/
  26. ene-ub6250/
  27. ess/
  28. go7007/
  29. intel/
  30. isci/
  31. kaweth/
  32. keyspan/
  33. keyspan_pda/
  34. korg/
  35. libertas/
  36. main/
  37. matrox/
  38. moxa/
  39. mrvl/
  40. mwl8k/
  41. myricom/
  42. ositech/
  43. qlogic/
  44. r128/
  45. radeon/
  46. rtl_nic/
  47. rtlwifi/
  48. s5p-mfc/
  49. sb16/
  50. slicoss/
  51. sun/
  52. sxg/
  53. tehuti/
  54. ti-connectivity/
  55. tigon/
  56. ttusb-budget/
  57. ueagle-atm/
  58. usbdux/
  59. vicam/
  60. vxge/
  61. yam/
  62. yamaha/
  63. GPL-3
  64. LICENCE.Marvell
  65. LICENCE.OLPC
  66. LICENCE.agere
  67. LICENCE.atheros_firmware
  68. LICENCE.broadcom_bcm43xx
  69. LICENCE.ca0132
  70. LICENCE.chelsio_firmware
  71. LICENCE.cw1200
  72. LICENCE.ene_firmware
  73. LICENCE.go7007
  74. LICENCE.i2400m
  75. LICENCE.ibt_firmware
  76. LICENCE.iwlwifi_firmware
  77. LICENCE.mwl8335
  78. LICENCE.myri10ge_firmware
  79. LICENCE.phanfw
  80. LICENCE.qla2xxx
  81. LICENCE.ralink-firmware.txt
  82. LICENCE.ralink_a_mediatek_company_firmware
  83. LICENCE.rtlwifi_firmware.txt
  84. LICENCE.tda7706-firmware.txt
  85. LICENCE.ti-connectivity
  86. LICENCE.ueagle-atm4-firmware
  87. LICENCE.via_vt6656
  88. LICENCE.wl1251
  89. LICENCE.xc5000
  90. LICENSE.amd-ucode
  91. LICENSE.dib0700
  92. LICENSE.qca_firmware
  93. LICENSE.radeon
  94. Makefile
  95. README
  96. README.md
  97. TDA7706_OM_v2.5.1_boot.txt
  98. TDA7706_OM_v3.0.2_boot.txt
  99. WHENCE
  100. agere_ap_fw.bin
  101. agere_sta_fw.bin
  102. ar5523.bin
  103. ar7010.fw
  104. ar7010_1_1.fw
  105. ar9170-1.fw
  106. ar9170-2.fw
  107. ar9271.fw
  108. ath3k-1.fw
  109. atmsar11.fw
  110. bnx2x-e1-4.8.53.0.fw
  111. bnx2x-e1-5.2.13.0.fw
  112. bnx2x-e1-5.2.7.0.fw
  113. bnx2x-e1h-4.8.53.0.fw
  114. bnx2x-e1h-5.2.13.0.fw
  115. bnx2x-e1h-5.2.7.0.fw
  116. carl9170-1.fw
  117. cbfw-3.2.1.1.bin
  118. cbfw-3.2.3.0.bin
  119. configure
  120. ct2fw-3.2.1.1.bin
  121. ct2fw-3.2.3.0.bin
  122. ctefx.bin
  123. ctfw-3.2.1.1.bin
  124. ctfw-3.2.3.0.bin
  125. ctspeq.bin
  126. dvb-fe-xc5000-1.6.114.fw
  127. dvb-usb-dib0700-1.20.fw
  128. dvb-usb-terratec-h5-drxk.fw
  129. f2255usb.bin
  130. htc_7010.fw
  131. htc_9271.fw
  132. i2400m-fw-usb-1.4.sbcf
  133. i2400m-fw-usb-1.5.sbcf
  134. i6050-fw-usb-1.5.sbcf
  135. intelliport2.bin
  136. iwlwifi-100-5.ucode
  137. iwlwifi-1000-3.ucode
  138. iwlwifi-1000-5.ucode
  139. iwlwifi-105-6.ucode
  140. iwlwifi-135-6.ucode
  141. iwlwifi-2000-6.ucode
  142. iwlwifi-2030-6.ucode
  143. iwlwifi-3160-7.ucode
  144. iwlwifi-3160-8.ucode
  145. iwlwifi-3945-2.ucode
  146. iwlwifi-4965-2.ucode
  147. iwlwifi-5000-1.ucode
  148. iwlwifi-5000-2.ucode
  149. iwlwifi-5000-5.ucode
  150. iwlwifi-5150-2.ucode
  151. iwlwifi-6000-4.ucode
  152. iwlwifi-6000g2a-5.ucode
  153. iwlwifi-6000g2a-6.ucode
  154. iwlwifi-6000g2b-5.ucode
  155. iwlwifi-6000g2b-6.ucode
  156. iwlwifi-6050-4.ucode
  157. iwlwifi-6050-5.ucode
  158. iwlwifi-7260-7.ucode
  159. iwlwifi-7260-8.ucode
  160. lbtf_usb.bin
  161. lgs8g75.fw
  162. mt7650.bin
  163. mts_cdma.fw
  164. mts_edge.fw
  165. mts_gsm.fw
  166. mts_mt9234mu.fw
  167. mts_mt9234zba.fw
  168. myri10ge_eth_big_z8e.dat
  169. myri10ge_eth_z8e.dat
  170. myri10ge_ethp_big_z8e.dat
  171. myri10ge_ethp_z8e.dat
  172. myri10ge_rss_eth_big_z8e.dat
  173. myri10ge_rss_eth_z8e.dat
  174. myri10ge_rss_ethp_big_z8e.dat
  175. myri10ge_rss_ethp_z8e.dat
  176. phanfw.bin
  177. ql2100_fw.bin
  178. ql2200_fw.bin
  179. ql2300_fw.bin
  180. ql2322_fw.bin
  181. ql2400_fw.bin
  182. ql2500_fw.bin
  183. rp2.fw
  184. rt2561.bin
  185. rt2561s.bin
  186. rt2661.bin
  187. rt2860.bin
  188. rt2870.bin
  189. rt3071.bin
  190. rt3290.bin
  191. rt73.bin
  192. sdd_sagrad_1091_1098.bin
  193. ti_3410.fw
  194. ti_5052.fw
  195. tlg2300_firmware.bin
  196. tr_smctr.bin
  197. usbdux_firmware.bin
  198. usbduxfast_firmware.bin
  199. usbduxsigma_firmware.bin
  200. v4l-cx231xx-avcore-01.fw
  201. v4l-cx23418-apu.fw
  202. v4l-cx23418-cpu.fw
  203. v4l-cx23418-dig.fw
  204. v4l-cx23885-avcore-01.fw
  205. v4l-cx25840.fw
  206. vntwusb.fw
  207. whiteheat.fw
  208. whiteheat_loader.fw
  209. wsm_22.bin
README.md

ath10k-firmware

Firmware files for ath10k, a mac80211 driver for QCA988x. The directory structure is:

  • ath10k: the default firmware files, copy this directory structure to your firmware file location, most likely /lib/firmware/

  • 10.1: firmware images from the 10.1 firmware branch, primary use case AP mode, STA specific features might not work

  • main: firmware images from the “main” firmware branch, primary use case STA mode

For more information check the wiki:

http://wireless.kernel.org/en/users/Drivers/ath10k/firmware