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

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

Merge tag 'wireless-drivers-for-davem-2017-01-29' of... 

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



Kalle Valo says:

====================
wireless-drivers fixes for 4.10

Most important here are fixes to two iwlwifi crashes, but there's also
a firmware naming fix for iwlwifi and a revert of an older bcma patch.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4af0e5bb 2b1d530c

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -10195,7 +10195,6 @@ F: drivers/media/tuners/qt1010* 
QUALCOMM ATHEROS ATH9K WIRELESS DRIVER

M:	QCA ath9k Development <ath9k-devel@qca.qualcomm.com>

L:	linux-wireless@vger.kernel.org

L:	ath9k-devel@lists.ath9k.org

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

S:	Supported

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

drivers/bcma/bcma_private.h

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ int bcma_sprom_get(struct bcma_bus *bus); 
void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc);

void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);

void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);

#ifdef CONFIG_BCMA_DRIVER_MIPS

void bcma_chipco_serial_init(struct bcma_drv_cc *cc);

#endif /* CONFIG_BCMA_DRIVER_MIPS */



/* driver_chipcommon_b.c */

int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);

drivers/bcma/driver_chipcommon.c

+3 −8
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
#include <linux/platform_device.h>

#include <linux/bcma/bcma.h>



static void bcma_chipco_serial_init(struct bcma_drv_cc *cc);



static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset,

					 u32 mask, u32 value)

{
@@ -186,9 +184,6 @@ void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc) 
	if (cc->capabilities & BCMA_CC_CAP_PMU)

		bcma_pmu_early_init(cc);



	if (IS_BUILTIN(CONFIG_BCM47XX) && bus->hosttype == BCMA_HOSTTYPE_SOC)

		bcma_chipco_serial_init(cc);



	if (bus->hosttype == BCMA_HOSTTYPE_SOC)

		bcma_core_chipcommon_flash_detect(cc);
@@ -378,9 +373,9 @@ u32 bcma_chipco_gpio_pulldown(struct bcma_drv_cc *cc, u32 mask, u32 value) 
	return res;

}



static void bcma_chipco_serial_init(struct bcma_drv_cc *cc)

#ifdef CONFIG_BCMA_DRIVER_MIPS

void bcma_chipco_serial_init(struct bcma_drv_cc *cc)

{

#if IS_BUILTIN(CONFIG_BCM47XX)

	unsigned int irq;

	u32 baud_base;

	u32 i;
@@ -422,5 +417,5 @@ static void bcma_chipco_serial_init(struct bcma_drv_cc *cc) 
		ports[i].baud_base = baud_base;

		ports[i].reg_shift = 0;

	}

#endif /* CONFIG_BCM47XX */

}

#endif /* CONFIG_BCMA_DRIVER_MIPS */

drivers/bcma/driver_mips.c

+3 −0
Original line number Diff line number Diff line
@@ -278,9 +278,12 @@ static void bcma_core_mips_nvram_init(struct bcma_drv_mips *mcore) 


void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)

{

	struct bcma_bus *bus = mcore->core->bus;



	if (mcore->early_setup_done)

		return;



	bcma_chipco_serial_init(&bus->drv_cc);

	bcma_core_mips_nvram_init(mcore);



	mcore->early_setup_done = true;

drivers/net/wireless/intel/iwlwifi/iwl-8000.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 


#define IWL8000_FW_PRE "iwlwifi-8000C-"

#define IWL8000_MODULE_FIRMWARE(api) \

	IWL8000_FW_PRE "-" __stringify(api) ".ucode"

	IWL8000_FW_PRE __stringify(api) ".ucode"



#define IWL8265_FW_PRE "iwlwifi-8265-"

#define IWL8265_MODULE_FIRMWARE(api) \