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

Merge tag 'wireless-drivers-next-for-davem-2017-08-28' of... 

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



Kalle Valo says:

====================
wireless-drivers-next patches for 4.14

rsi driver is getting a lot of new features lately, but as usual
active development happening on iwlwifi as well as other drivers.

I pulled wireless-drivers to fix multiple conflicts in iwlwifi and to
make it easier further development.

Major changes:

ath10k

* initial UBS bus support (no full support yet)

* add tdls support for 10.4 firmware

ath9k

* add Dell Wireless 1802

wil6210

* support FW RSSI reporting

rsi

* support legacy power save, U-APSD, rf-kill and AP mode

* RTS threshold configuration

brcmfmac

* support CYW4373 SDIO/USB chipset

iwlwifi

* some more code moved to a new directory

* add new PCI ID for 7265D
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 22eac913 5307eca1

drivers/bcma/Kconfig

+2 −7
Original line number Diff line number Diff line
@@ -3,11 +3,8 @@ config BCMA_POSSIBLE 
	depends on HAS_IOMEM && HAS_DMA

	default y



menu "Broadcom specific AMBA"

	depends on BCMA_POSSIBLE



config BCMA

	tristate "BCMA support"

menuconfig BCMA

	tristate "Broadcom specific AMBA"

	depends on BCMA_POSSIBLE

	help

	  Bus driver for Broadcom specific Advanced Microcontroller Bus
@@ -117,5 +114,3 @@ config BCMA_DEBUG 
	  This turns on additional debugging messages.



	  If unsure, say N
 


endmenu

drivers/net/wireless/ath/ar5523/ar5523.c

+1 −1
Original line number Diff line number Diff line
@@ -1749,7 +1749,7 @@ static void ar5523_disconnect(struct usb_interface *intf) 
	{ USB_DEVICE((vendor), (device) + 1), \

		.driver_info = AR5523_FLAG_ABG|AR5523_FLAG_PRE_FIRMWARE }



static struct usb_device_id ar5523_id_table[] = {

static const struct usb_device_id ar5523_id_table[] = {

	AR5523_DEVICE_UG(0x168c, 0x0001),	/* Atheros / AR5523 */

	AR5523_DEVICE_UG(0x0cf3, 0x0001),	/* Atheros2 / AR5523_1 */

	AR5523_DEVICE_UG(0x0cf3, 0x0003),	/* Atheros2 / AR5523_2 */

drivers/net/wireless/ath/ath10k/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,13 @@ config ATH10K_SDIO 
	  This module adds experimental support for SDIO/MMC bus. Currently

	  work in progress and will not fully work.



config ATH10K_USB

	tristate "Atheros ath10k USB support (EXPERIMENTAL)"

	depends on ATH10K && USB

	---help---

	  This module adds experimental support for USB bus. Currently

	  work in progress and will not fully work.



config ATH10K_DEBUG

	bool "Atheros ath10k debugging"

	depends on ATH10K

drivers/net/wireless/ath/ath10k/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -30,5 +30,8 @@ ath10k_pci-$(CONFIG_ATH10K_AHB) += ahb.o 
obj-$(CONFIG_ATH10K_SDIO) += ath10k_sdio.o

ath10k_sdio-y += sdio.o



obj-$(CONFIG_ATH10K_USB) += ath10k_usb.o

ath10k_usb-y += usb.o



# for tracing framework to find trace.h

CFLAGS_trace.o := -I$(src)

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

+10 −5
Original line number Diff line number Diff line
@@ -197,35 +197,40 @@ static int ath10k_ahb_rst_ctrl_init(struct ath10k *ar) 


	dev = &ar_ahb->pdev->dev;



	ar_ahb->core_cold_rst = devm_reset_control_get(dev, "wifi_core_cold");

	ar_ahb->core_cold_rst = devm_reset_control_get_exclusive(dev,

								 "wifi_core_cold");

	if (IS_ERR(ar_ahb->core_cold_rst)) {

		ath10k_err(ar, "failed to get core cold rst ctrl: %ld\n",

			   PTR_ERR(ar_ahb->core_cold_rst));

		return PTR_ERR(ar_ahb->core_cold_rst);

	}



	ar_ahb->radio_cold_rst = devm_reset_control_get(dev, "wifi_radio_cold");

	ar_ahb->radio_cold_rst = devm_reset_control_get_exclusive(dev,

								  "wifi_radio_cold");

	if (IS_ERR(ar_ahb->radio_cold_rst)) {

		ath10k_err(ar, "failed to get radio cold rst ctrl: %ld\n",

			   PTR_ERR(ar_ahb->radio_cold_rst));

		return PTR_ERR(ar_ahb->radio_cold_rst);

	}



	ar_ahb->radio_warm_rst = devm_reset_control_get(dev, "wifi_radio_warm");

	ar_ahb->radio_warm_rst = devm_reset_control_get_exclusive(dev,

								  "wifi_radio_warm");

	if (IS_ERR(ar_ahb->radio_warm_rst)) {

		ath10k_err(ar, "failed to get radio warm rst ctrl: %ld\n",

			   PTR_ERR(ar_ahb->radio_warm_rst));

		return PTR_ERR(ar_ahb->radio_warm_rst);

	}



	ar_ahb->radio_srif_rst = devm_reset_control_get(dev, "wifi_radio_srif");

	ar_ahb->radio_srif_rst = devm_reset_control_get_exclusive(dev,

								  "wifi_radio_srif");

	if (IS_ERR(ar_ahb->radio_srif_rst)) {

		ath10k_err(ar, "failed to get radio srif rst ctrl: %ld\n",

			   PTR_ERR(ar_ahb->radio_srif_rst));

		return PTR_ERR(ar_ahb->radio_srif_rst);

	}



	ar_ahb->cpu_init_rst = devm_reset_control_get(dev, "wifi_cpu_init");

	ar_ahb->cpu_init_rst = devm_reset_control_get_exclusive(dev,

								"wifi_cpu_init");

	if (IS_ERR(ar_ahb->cpu_init_rst)) {

		ath10k_err(ar, "failed to get cpu init rst ctrl: %ld\n",

			   PTR_ERR(ar_ahb->cpu_init_rst));

CRA Git | Maintained and supported by SUSTech CRA and CCSE