Commit a9b8a894 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents c9be4a5c 5e20a4b5

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -1351,6 +1351,14 @@ W: http://wireless.kernel.org/en/users/Drivers/ath9k 
S:	Supported

F:	drivers/net/wireless/ath/ath9k/



WILOCITY WIL6210 WIRELESS DRIVER

M:	Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>

L:	linux-wireless@vger.kernel.org

L:	wil6210@qca.qualcomm.com

S:	Supported

W:	http://wireless.kernel.org/en/users/Drivers/wil6210

F:	drivers/net/wireless/ath/wil6210/



CARL9170 LINUX COMMUNITY WIRELESS DRIVER

M:	Christian Lamparter <chunkeey@googlemail.com>

L:	linux-wireless@vger.kernel.org

drivers/net/wireless/ath/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -30,5 +30,6 @@ source "drivers/net/wireless/ath/ath9k/Kconfig" 
source "drivers/net/wireless/ath/carl9170/Kconfig"

source "drivers/net/wireless/ath/ath6kl/Kconfig"

source "drivers/net/wireless/ath/ar5523/Kconfig"

source "drivers/net/wireless/ath/wil6210/Kconfig"



endif

drivers/net/wireless/ath/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ obj-$(CONFIG_ATH9K_HW) += ath9k/ 
obj-$(CONFIG_CARL9170)		+= carl9170/

obj-$(CONFIG_ATH6KL)		+= ath6kl/

obj-$(CONFIG_AR5523)		+= ar5523/

obj-$(CONFIG_WIL6210)		+= wil6210/



obj-$(CONFIG_ATH_COMMON)	+= ath.o

drivers/net/wireless/ath/wil6210/Kconfig

0 → 100644
+29 −0
Original line number Diff line number Diff line 
config WIL6210

	tristate "Wilocity 60g WiFi card wil6210 support"

	depends on CFG80211

	depends on PCI

	default n

	---help---

	  This module adds support for wireless adapter based on

	  wil6210 chip by Wilocity. It supports operation on the

	  60 GHz band, covered by the IEEE802.11ad standard.



	  http://wireless.kernel.org/en/users/Drivers/wil6210



	  If you choose to build it as a module, it will be called

	  wil6210



config WIL6210_ISR_COR

	bool "Use Clear-On-Read mode for ISR registers for wil6210"

	depends on WIL6210

	default y

	---help---

	  ISR registers on wil6210 chip may operate in either

	  COR (Clear-On-Read) or W1C (Write-1-to-Clear) mode.

	  For production code, use COR (say y); is default since

	  it saves extra target transaction;

	  For ISR debug, use W1C (say n); is allows to monitor ISR

	  registers with debugfs. If COR were used, ISR would

	  self-clear when accessed for debug purposes, it makes

	  such monitoring impossible.

	  Say y unless you debug interrupts

drivers/net/wireless/ath/wil6210/Makefile

0 → 100644
+13 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_WIL6210) += wil6210.o



wil6210-objs := main.o

wil6210-objs += netdev.o

wil6210-objs += cfg80211.o

wil6210-objs += pcie_bus.o

wil6210-objs += debugfs.o

wil6210-objs += wmi.o

wil6210-objs += interrupt.o

wil6210-objs += txrx.o



subdir-ccflags-y += -Werror

subdir-ccflags-y += -D__CHECK_ENDIAN__