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

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

Merge branch 'wireless' 



John W. Linville says:

====================
Please accept this pull request intended for the 3.9 stream!

Included are a mac80211 pull, an iwlwifi pull (actually two -- one
was a fast-forward), a wl12xx pull, and a couple of Bluetooth pulls.

On mac80211, Johannes says:

"I've included
 * AKM definitions from Bing,
 * mesh fixes from Thomas, including a fix from him for me breaking his
   patch while applying,
 * channel check fix from Simon,
 * an old patch from Yoni Divinsky who doesn't even work for TI any
   more, to configure the WEP TX key for ARP offload etc.
 * MAC ACL API from Vasanth
 * a fix for the infamous chanctx_conf warning from Arnd
 * from myself, a fix for my previous aggregation changes, some cleanup
   and some improvements and fixes for WoWLAN"

On iwlwifi, Johannes says:

"Two small changes for iwlwifi-next, one to update all our Copyright
notices and one to provide the RX page order."

And also:

"So what I have here is some cleanups, preparations and the new MVM
(multi-virtual MAC) driver itself and (this is new) some work on the
transport API as well as a message flooding fix."

On wl12xx, Luca says:

"Lots of bugfixes and improvements in our TI wireless drivers,
including support for multi-channel.  Intended for 3.9."

On Bluetooth, Gustavo says:

"This is my first pull request to 3.9. The biggest changes here are from Johan
Hedberg who made a lot of fixes in the Management interface. The issues arose
due to a new test tool we wrote and the usage of the Management interface as
default in BlueZ 5. The rest of the patches are more clean ups and small
fixes."

And also:

"Here goes another batch intended for 3.9, the majority of the patch here are
from Johan who is fixing many issues in the management interface that have
appeared lately. The rest of the patches are just small improvements, fixes
and clean ups."

Along with those are the usual variety of updates/enhancements to
the mwl8k, mwifiex, ath9k, rtlwifi, and rt2x00 drivers as well as
a few updates for the ssb and bcma busses.  I don't think there are
any big headliners there.

Please let me know if there are problems!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b285109d f5237f27

drivers/bcma/bcma_private.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ int bcma_sprom_get(struct bcma_bus *bus); 
/* driver_chipcommon.c */

#ifdef CONFIG_BCMA_DRIVER_MIPS

void bcma_chipco_serial_init(struct bcma_drv_cc *cc);

extern struct platform_device bcma_pflash_dev;

#endif /* CONFIG_BCMA_DRIVER_MIPS */



/* driver_chipcommon_pmu.c */

drivers/bcma/driver_chipcommon_nflash.c

+2 −2
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 
 * Licensed under the GNU/GPL. See COPYING for details.

 */



#include "bcma_private.h"



#include <linux/platform_device.h>

#include <linux/bcma/bcma.h>



#include "bcma_private.h"



struct platform_device bcma_nflash_dev = {

	.name		= "bcma_nflash",

	.num_resources	= 0,

drivers/bcma/driver_chipcommon_sflash.c

+2 −2
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 
 * Licensed under the GNU/GPL. See COPYING for details.

 */



#include "bcma_private.h"



#include <linux/platform_device.h>

#include <linux/bcma/bcma.h>



#include "bcma_private.h"



static struct resource bcma_sflash_resource = {

	.name	= "bcma_sflash",

	.start	= BCMA_SOC_FLASH2,

drivers/bcma/driver_gpio.c

+11 −0
Original line number Diff line number Diff line
@@ -73,6 +73,16 @@ static void bcma_gpio_free(struct gpio_chip *chip, unsigned gpio) 
	bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);

}



static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)

{

	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);



	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)

		return bcma_core_irq(cc->core);

	else

		return -EINVAL;

}



int bcma_gpio_init(struct bcma_drv_cc *cc)

{

	struct gpio_chip *chip = &cc->gpio;
@@ -85,6 +95,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) 
	chip->set		= bcma_gpio_set_value;

	chip->direction_input	= bcma_gpio_direction_input;

	chip->direction_output	= bcma_gpio_direction_output;

	chip->to_irq		= bcma_gpio_to_irq;

	chip->ngpio		= 16;

	/* There is just one SoC in one device and its GPIO addresses should be

	 * deterministic to address them more easily. The other buses could get

drivers/bcma/driver_mips.c

+33 −5
Original line number Diff line number Diff line
@@ -14,11 +14,33 @@ 


#include <linux/bcma/bcma.h>



#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>

#include <linux/serial.h>

#include <linux/serial_core.h>

#include <linux/serial_reg.h>

#include <linux/time.h>



static const char *part_probes[] = { "bcm47xxpart", NULL };



static struct physmap_flash_data bcma_pflash_data = {

	.part_probe_types	= part_probes,

};



static struct resource bcma_pflash_resource = {

	.name	= "bcma_pflash",

	.flags  = IORESOURCE_MEM,

};



struct platform_device bcma_pflash_dev = {

	.name		= "physmap-flash",

	.dev		= {

		.platform_data  = &bcma_pflash_data,

	},

	.resource	= &bcma_pflash_resource,

	.num_resources	= 1,

};



/* The 47162a0 hangs when reading MIPS DMP registers registers */

static inline bool bcma_core_mips_bcm47162a0_quirk(struct bcma_device *dev)

{
@@ -211,6 +233,7 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore) 
{

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

	struct bcma_drv_cc *cc = &bus->drv_cc;

	struct bcma_pflash *pflash = &cc->pflash;



	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {

	case BCMA_CC_FLASHT_STSER:
@@ -220,15 +243,20 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore) 
		break;

	case BCMA_CC_FLASHT_PARA:

		bcma_debug(bus, "Found parallel flash\n");

		cc->pflash.present = true;

		cc->pflash.window = BCMA_SOC_FLASH2;

		cc->pflash.window_size = BCMA_SOC_FLASH2_SZ;

		pflash->present = true;

		pflash->window = BCMA_SOC_FLASH2;

		pflash->window_size = BCMA_SOC_FLASH2_SZ;



		if ((bcma_read32(cc->core, BCMA_CC_FLASH_CFG) &

		     BCMA_CC_FLASH_CFG_DS) == 0)

			cc->pflash.buswidth = 1;

			pflash->buswidth = 1;

		else

			cc->pflash.buswidth = 2;

			pflash->buswidth = 2;



		bcma_pflash_data.width = pflash->buswidth;

		bcma_pflash_resource.start = pflash->window;

		bcma_pflash_resource.end = pflash->window + pflash->window_size;



		break;

	default:

		bcma_err(bus, "Flash type not supported\n");