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

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

Merge tag 'wireless-drivers-next-for-davem-2018-03-24' of... 

Merge tag 'wireless-drivers-next-for-davem-2018-03-24' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for 4.17

The biggest changes are the bluetooth related patches to the rsi
driver. It adds a new bluetooth driver which communicates directly
with the wireless driver and the interface is defined in
include/net/rsi_91x.h.

Major changes:

wl1251

* read the MAC address from the NVS file

rtlwifi

* enable mac80211 fast-tx support

mt76

* add capability to select tx/rx antennas

mt7601

* let mac80211 validate rx CCMP Packet Number (PN)

rsi

* bluetooth: add new btrsi driver

* btcoex support with the new btrsi driver
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents da18ab32 28bf8312

drivers/bcma/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ config BCMA_DRIVER_PCI 


config BCMA_DRIVER_PCI_HOSTMODE

	bool "Driver for PCI core working in hostmode"

	depends on MIPS && BCMA_DRIVER_PCI && PCI_DRIVERS_LEGACY

	depends on MIPS && BCMA_DRIVER_PCI && PCI_DRIVERS_LEGACY && BCMA = y

	help

	  PCI core hostmode operation (external PCI bus).

drivers/bcma/driver_chipcommon_pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void bcma_pmu_resources_init(struct bcma_drv_cc *cc) 
	 * Add some delay; allow resources to come up and settle.

	 * Delay is required for SoC (early init).

	 */

	mdelay(2);

	usleep_range(2000, 2500);

}



/* Disable to allow reading SPROM. Don't know the adventages of enabling it. */

drivers/bcma/host_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = { 
	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_DELL, 0x0016) },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_DELL, 0x0018) },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_FOXCONN, 0xe092) },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_HP, 0x804a) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a0) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },

drivers/bluetooth/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -392,4 +392,16 @@ config BT_QCOMSMD 
	  Say Y here to compile support for HCI over Qualcomm SMD into the

	  kernel or say M to compile as a module.



config BT_HCIRSI

	tristate "Redpine HCI support"

	default n

	select RSI_COEX

	help

	  Redpine BT driver.

	  This driver handles BT traffic from upper layers and pass

	  to the RSI_91x coex module for further scheduling to device



	  Say Y here to compile support for HCI over Redpine into the

	  kernel or say M to compile as a module.



endmenu

drivers/bluetooth/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ obj-$(CONFIG_BT_QCA) += btqca.o 


obj-$(CONFIG_BT_HCIUART_NOKIA)	+= hci_nokia.o



obj-$(CONFIG_BT_HCIRSI)		+= btrsi.o



btmrvl-y			:= btmrvl_main.o

btmrvl-$(CONFIG_DEBUG_FS)	+= btmrvl_debugfs.o