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