Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75b99c07 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'remotes/origin/tmp-896bb812' into HEAD"

parents a7d8f029 63900f4b

drivers/net/wireless/ath/ath10k/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config ATH10K 
        tristate "Atheros 802.11ac wireless cards support"

        depends on MAC80211 && HAS_DMA

	select ATH_COMMON

	select CRC32

        ---help---

          This module adds support for wireless adapters based on

          Atheros IEEE 802.11ac family of chipsets.
@@ -14,6 +15,12 @@ config ATH10K_PCI 
	---help---

	  This module adds support for PCIE bus



config ATH10K_AHB

	bool "Atheros ath10k AHB support"

	depends on ATH10K_PCI && OF && RESET_CONTROLLER

	---help---

	  This module adds support for AHB bus



config ATH10K_DEBUG

	bool "Atheros ath10k debugging"

	depends on ATH10K

drivers/net/wireless/ath/ath10k/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -25,5 +25,7 @@ obj-$(CONFIG_ATH10K_PCI) += ath10k_pci.o 
ath10k_pci-y += pci.o \

		ce.o



ath10k_pci-$(CONFIG_ATH10K_AHB) += ahb.o



# for tracing framework to find trace.h

CFLAGS_trace.o := -I$(src)

drivers/net/wireless/ath/ath10k/ahb.c

0 → 100644
+875 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/ath/ath10k/ahb.h

0 → 100644
+87 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/ath/ath10k/bmi.c

+2 −2
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ int ath10k_bmi_lz_data(struct ath10k *ar, const void *buffer, u32 length) 
	u32 txlen;

	int ret;



	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi lz data buffer 0x%p length %d\n",

	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi lz data buffer 0x%pK length %d\n",

		   buffer, length);



	if (ar->bmi.done_sent) {
@@ -287,7 +287,7 @@ int ath10k_bmi_fast_download(struct ath10k *ar, 
	int ret;



	ath10k_dbg(ar, ATH10K_DBG_BMI,

		   "bmi fast download address 0x%x buffer 0x%p length %d\n",

		   "bmi fast download address 0x%x buffer 0x%pK length %d\n",

		   address, buffer, length);



	ret = ath10k_bmi_lz_stream_start(ar, address);