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

Commit b8fa3bfb authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-for-davem-2017-12-18' of... 

Merge tag 'wireless-drivers-next-for-davem-2017-12-18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



The drivers/net/wireless/intel/iwlwifi/pcie/drv.c conflict was
resolved using a diff provided by Kalle in his pull request.

Kalle Valo says:

====================
wireless-drivers-next patches for 4.16

A bigger pull request this time, the most visible change being the new
driver mt76. But there's also Kconfig refactoring in ath9k and ath10k,
work beginning in iwlwifi to have rate scaling in firmware/hardware,
wcn3990 support getting closer in ath10k and lots of smaller changes.

mt76

* a new driver for MT76x2e, a 2x2 PCIe 802.11ac chipset by MediaTek

ath10k

* enable multiqueue support for all hw using mac80211 wake_tx_queue op

* new Kconfig option ATH10K_SPECTRAL to save RAM

* show tx stats on QCA9880

* new qcom,ath10k-calibration-variant DT entry

* WMI layer support for wcn3990

ath9k

* new Kconfig option ATH9K_COMMON_SPECTRAL to save RAM

wcn36xx

* hardware scan offload support

wil6210

* run-time PM support when interface is down

iwlwifi

* initial work for rate-scaling offload

* Support for new FW API version 36

* Rename the temporary hw name A000 to 22000

ssb

* make SSB a menuconfig to ease disabling it all

mwl8k

* enable non-DFS 5G channels 149-165
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 918341e0 1dde35d0

Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
* MediaTek mt76xx devices



This node provides properties for configuring the MediaTek mt76xx wireless

device. The node is expected to be specified as a child node of the PCI

controller to which the wireless chip is connected.



Optional properties:



- mac-address: See ethernet.txt in the parent directory

- local-mac-address: See ethernet.txt in the parent directory

- ieee80211-freq-limit: See ieee80211.txt

- mediatek,mtd-eeprom: Specify a MTD partition + offset containing EEPROM data



Optional nodes:

- led: Properties for a connected LED

  Optional properties:

    - led-sources: See Documentation/devicetree/bindings/leds/common.txt



&pcie {

	pcie0 {

		wifi@0,0 {

			compatible = "mediatek,mt76";

			reg = <0x0000 0 0 0 0>;

			ieee80211-freq-limit = <5000000 6000000>;

			mediatek,mtd-eeprom = <&factory 0x8000>;



			led {

				led-sources = <2>;

			};

		};

	};

};

Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ Optional properties: 
- qcom,msi_addr: MSI interrupt address.

- qcom,msi_base: Base value to add before writing MSI data into

		MSI address register.

- qcom,ath10k-calibration-variant: string to search for in the board-2.bin

				   variant list with the same bus and device

				   specific ids

- qcom,ath10k-calibration-data : calibration data + board specific data

				 as an array, the length can vary between

				 hw versions.

drivers/bcma/driver_pcie2.c

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ static void bcma_core_pcie2_hw_ltr_war(struct bcma_drv_pcie2 *pcie2) 
		bcma_core_pcie2_set_ltr_vals(pcie2);



		/* TODO:

		si_core_wrapperreg(pcie2, 3, 0x60, 0x8080, 0); */

		 *si_core_wrapperreg(pcie2, 3, 0x60, 0x8080, 0);

		 */



		/* enable the LTR */

		devstsctr2 |= PCIE2_CAP_DEVSTSCTRL2_LTRENAB;

drivers/net/wireless/ath/ath10k/Kconfig

+8 −1
Original line number Diff line number Diff line
@@ -47,12 +47,19 @@ config ATH10K_DEBUG 
config ATH10K_DEBUGFS

	bool "Atheros ath10k debugfs support"

	depends on ATH10K && DEBUG_FS

	select RELAY

	---help---

	  Enabled debugfs support



	  If unsure, say Y to make it easier to debug problems.



config ATH10K_SPECTRAL

	bool "Atheros ath10k spectral scan support"

	depends on ATH10K_DEBUGFS

	select RELAY

	default n

	---help---

	  Say Y to enable access to the FFT/spectral data via debugfs.



config ATH10K_TRACING

	bool "Atheros ath10k tracing support"

	depends on ATH10K

drivers/net/wireless/ath/ath10k/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ ath10k_core-y += mac.o \ 
		 p2p.o \

		 swap.o



ath10k_core-$(CONFIG_ATH10K_DEBUGFS) += spectral.o

ath10k_core-$(CONFIG_ATH10K_SPECTRAL) += spectral.o

ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o

ath10k_core-$(CONFIG_ATH10K_TRACING) += trace.o

ath10k_core-$(CONFIG_THERMAL) += thermal.o