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

Merge tag 'wireless-drivers-next-2020-07-20' of... 

Merge tag 'wireless-drivers-next-2020-07-20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for v5.9

First set of patches for v5.9. This comes later than usual as I was
offline for two weeks. The biggest change here is moving Microchip
wilc1000 driver from staging. There was an immutable topic branch with
one commit moving the whole driver and the topic branch was pulled
both to staging-next and wireless-drivers-next. At the moment the only
reported conflict is in MAINTAINERS file, so I'm hoping the move
should go smoothly.

Other notable changes are ath11k getting 6 GHz band support and rtw88
supporting RTL8821CE. And there's also the usual fixes, API changes
and cleanups all over.

Major changes:

wilc1000

* move from drivers/staging to drivers/net/wireless/microchip

ath11k

* add 6G band support

* add spectral scan support

iwlwifi

* make FW reconfiguration quieter by not using warn level

rtw88

* add support for RTL8821CE
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 256ca744 0e20c3e1

MAINTAINERS

+7 −7
Original line number Diff line number Diff line
@@ -11352,6 +11352,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Supported

F:	drivers/usb/gadget/udc/atmel_usba_udc.*









MICROCHIP WILC1000 WIFI DRIVER









M:	Ajay Singh <ajay.kathat@microchip.com>









M:	Claudiu Beznea <claudiu.beznea@microchip.com>









L:	linux-wireless@vger.kernel.org









S:	Supported









F:	drivers/net/wireless/microchip/wilc1000/

















MICROCHIP XDMA DRIVER









M:	Ludovic Desroches <ludovic.desroches@microchip.com>









L:	linux-arm-kernel@lists.infradead.org








@@ -16256,13 +16263,6 @@ M:	Forest Bond <forest@alittletooquiet.net>







S:	Odd Fixes









F:	drivers/staging/vt665?/

















STAGING - WILC1000 WIFI DRIVER









M:	Adham Abozaeid <adham.abozaeid@microchip.com>









M:	Ajay Singh <ajay.kathat@microchip.com>









L:	linux-wireless@vger.kernel.org









S:	Supported









F:	drivers/staging/wilc1000/

















STAGING SUBSYSTEM









M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>









L:	devel@driverdev.osuosl.org
































drivers/net/wireless/Kconfig



+2
−1






























Original line number
Diff line number
Diff line







@@ -14,7 +14,7 @@ menuconfig WLAN







	  device drivers. For a complete list of drivers and documentation









	  on them refer to the wireless wiki:



















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









	  https://wireless.wiki.kernel.org/en/users/Drivers



















if WLAN


















@@ -40,6 +40,7 @@ source "drivers/net/wireless/intel/Kconfig"







source "drivers/net/wireless/intersil/Kconfig"









source "drivers/net/wireless/marvell/Kconfig"









source "drivers/net/wireless/mediatek/Kconfig"









source "drivers/net/wireless/microchip/Kconfig"









source "drivers/net/wireless/ralink/Kconfig"









source "drivers/net/wireless/realtek/Kconfig"









source "drivers/net/wireless/rsi/Kconfig"
































drivers/net/wireless/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -12,6 +12,7 @@ obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/







obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/









obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/









obj-$(CONFIG_WLAN_VENDOR_MEDIATEK) += mediatek/









obj-$(CONFIG_WLAN_VENDOR_MICROCHIP) += microchip/









obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/









obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/









obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
































drivers/net/wireless/admtek/adm8211.c



+5
−20






























Original line number
Diff line number
Diff line







@@ -1976,35 +1976,20 @@ static void adm8211_remove(struct pci_dev *pdev)







}





























#ifdef CONFIG_PM









static int adm8211_suspend(struct pci_dev *pdev, pm_message_t state)









{









	pci_save_state(pdev);









	pci_set_power_state(pdev, pci_choose_state(pdev, state));









	return 0;









}



















static int adm8211_resume(struct pci_dev *pdev)









{









	pci_set_power_state(pdev, PCI_D0);









	pci_restore_state(pdev);









	return 0;









}









#endif /* CONFIG_PM */



















#define adm8211_suspend NULL









#define adm8211_resume NULL



















MODULE_DEVICE_TABLE(pci, adm8211_pci_id_table);



















static SIMPLE_DEV_PM_OPS(adm8211_pm_ops, adm8211_suspend, adm8211_resume);



















/* TODO: implement enable_wake */









static struct pci_driver adm8211_driver = {









	.name		= "adm8211",









	.id_table	= adm8211_pci_id_table,









	.probe		= adm8211_probe,









	.remove		= adm8211_remove,









#ifdef CONFIG_PM









	.suspend	= adm8211_suspend,









	.resume		= adm8211_resume,









#endif /* CONFIG_PM */









	.driver.pm	= &adm8211_pm_ops,









};



















module_pci_driver(adm8211_driver);