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

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

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



Kalle Valo says:

====================
wireless-drivers-next patches for 4.15

The first pull request for 4.15, unusually late this time but still
relatively small. Also includes merge from wireless-drivers to fix
conflicts in iwlwifi.

Major changes:

rsi

* add P2P mode support

* sdio suspend and resume support

iwlwifi

* A fix and an addition for PCI devices for the A000 family

* Dump PCI registers when an error occurs, to make it easier to debug

rtlwifi

* add support for 64 bit DMA, enabled with a module parameter

* add module parameter to enable ASPM
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d18b4b35 66cc0442

drivers/bcma/Kconfig

+9 −9
Original line number Diff line number Diff line
@@ -10,14 +10,15 @@ menuconfig BCMA 
	  Bus driver for Broadcom specific Advanced Microcontroller Bus

	  Architecture.



if BCMA



# Support for Block-I/O. SELECT this from the driver that needs it.

config BCMA_BLOCKIO

	bool

	depends on BCMA



config BCMA_HOST_PCI_POSSIBLE

	bool

	depends on BCMA && PCI = y

	depends on PCI = y

	default y



config BCMA_HOST_PCI
@@ -28,7 +29,6 @@ config BCMA_HOST_PCI 


config BCMA_HOST_SOC

	bool "Support for BCMA in a SoC"

	depends on BCMA

	help

	  Host interface for a Broadcom AIX bus directly mapped into

	  the memory. This only works with the Broadcom SoCs from the
@@ -38,7 +38,7 @@ config BCMA_HOST_SOC 


config BCMA_DRIVER_PCI

	bool "BCMA Broadcom PCI core driver"

	depends on BCMA && PCI

	depends on PCI

	default y

	help

	  BCMA bus may have many versions of PCIe core. This driver
@@ -54,13 +54,13 @@ config BCMA_DRIVER_PCI 


config BCMA_DRIVER_PCI_HOSTMODE

	bool "Driver for PCI core working in hostmode"

	depends on BCMA && MIPS && BCMA_DRIVER_PCI

	depends on MIPS && BCMA_DRIVER_PCI

	help

	  PCI core hostmode operation (external PCI bus).



config BCMA_DRIVER_MIPS

	bool "BCMA Broadcom MIPS core driver"

	depends on BCMA && MIPS

	depends on MIPS

	help

	  Driver for the Broadcom MIPS core attached to Broadcom specific

	  Advanced Microcontroller Bus.
@@ -91,7 +91,6 @@ config BCMA_NFLASH 


config BCMA_DRIVER_GMAC_CMN

	bool "BCMA Broadcom GBIT MAC COMMON core driver"

	depends on BCMA

	help

	  Driver for the Broadcom GBIT MAC COMMON core attached to Broadcom

	  specific Advanced Microcontroller Bus.
@@ -100,7 +99,7 @@ config BCMA_DRIVER_GMAC_CMN 


config BCMA_DRIVER_GPIO

	bool "BCMA GPIO driver"

	depends on BCMA && GPIOLIB

	depends on GPIOLIB

	select GPIOLIB_IRQCHIP if BCMA_HOST_SOC

	help

	  Driver to provide access to the GPIO pins of the bcma bus.
@@ -109,8 +108,9 @@ config BCMA_DRIVER_GPIO 


config BCMA_DEBUG

	bool "BCMA debugging"

	depends on BCMA

	help

	  This turns on additional debugging messages.



	  If unsure, say N



endif # BCMA

drivers/bcma/driver_mips.c

+4 −3
Original line number Diff line number Diff line
@@ -184,10 +184,11 @@ static void bcma_core_mips_print_irq(struct bcma_device *dev, unsigned int irq) 
{

	int i;

	static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};

	printk(KERN_DEBUG KBUILD_MODNAME ": core 0x%04x, irq :", dev->id.id);



	bcma_debug(dev->bus, "core 0x%04x, irq :", dev->id.id);

	for (i = 0; i <= 6; i++)

		printk(" %s%s", irq_name[i], i == irq ? "*" : " ");

	printk("\n");

		pr_cont(" %s%s", irq_name[i], i == irq ? "*" : " ");

	pr_cont("\n");

}



static void bcma_core_mips_dump_irq(struct bcma_bus *bus)

drivers/net/wireless/broadcom/b43/phy_g.c

+1 −1
Original line number Diff line number Diff line
@@ -2297,7 +2297,7 @@ static u8 b43_gphy_aci_detect(struct b43_wldev *dev, u8 channel) 
static u8 b43_gphy_aci_scan(struct b43_wldev *dev)

{

	struct b43_phy *phy = &dev->phy;

	u8 ret[13];

	u8 ret[13] = { 0 };

	unsigned int channel = phy->channel;

	unsigned int i, j, start, end;

drivers/net/wireless/broadcom/b43/phy_ht.c

+3 −3
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void b43_radio_2059_rcal(struct b43_wldev *dev) 
/* Calibrate the internal RC oscillator? */

static void b43_radio_2057_rccal(struct b43_wldev *dev)

{

	const u16 radio_values[3][2] = {

	static const u16 radio_values[3][2] = {

		{ 0x61, 0xE9 }, { 0x69, 0xD5 }, { 0x73, 0x99 },

	};

	int i;
@@ -154,7 +154,7 @@ static void b43_radio_2059_init_pre(struct b43_wldev *dev) 


static void b43_radio_2059_init(struct b43_wldev *dev)

{

	const u16 routing[] = { R2059_C1, R2059_C2, R2059_C3 };

	static const u16 routing[] = { R2059_C1, R2059_C2, R2059_C3 };

	int i;



	/* Prepare (reset?) radio */
@@ -263,7 +263,7 @@ static void b43_phy_ht_reset_cca(struct b43_wldev *dev) 
static void b43_phy_ht_zero_extg(struct b43_wldev *dev)

{

	u8 i, j;

	u16 base[] = { 0x40, 0x60, 0x80 };

	static const u16 base[] = { 0x40, 0x60, 0x80 };



	for (i = 0; i < ARRAY_SIZE(base); i++) {

		for (j = 0; j < 4; j++)

drivers/net/wireless/broadcom/b43legacy/radio.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ u8 b43legacy_radio_aci_detect(struct b43legacy_wldev *dev, u8 channel) 
u8 b43legacy_radio_aci_scan(struct b43legacy_wldev *dev)

{

	struct b43legacy_phy *phy = &dev->phy;

	u8 ret[13];

	u8 ret[13] = { 0 };

	unsigned int channel = phy->channel;

	unsigned int i;

	unsigned int j;

CRA Git | Maintained and supported by SUSTech CRA and CCSE