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

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

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next 



John W. Linville says:

====================
Included is a Bluetooth pull -- Gustavo says:

"These are the Bluetooth bits for inclusion in 3.8, there is basically one big
thing here which is the High Speed patches from Andrei, he did a lot of work on
A2MP and management of AMP devices. The rest are mostly clean up and bug
fixes."

Also included is an NFC pull -- Samuel says:

"With this one we have:

- pn544 p2p support.
- pn544 physical and HCI layers separation. We are getting the pn544 driver
  ready to support non i2c physical layers.
- LLCP SNL (Service Name Lookup). This is the NFC p2p service discovery
  protocol.
- LLCP datagram sockets (connection less) support.
- IDR library usage for NFC devices indexes assignement.
- NFC netlink extension for setting and getting LLCP link characteristics.
- Various code style fixes and cleanups spread over the pn533, LLCP, HCI and
  pn544 code."

There are a couple of mac80211 pulls as well -- Johannes says:

"Please pull my mac80211-next tree to get the first round of new features
for 3.8. We have:
 * finally, the mac80211 multi-channel work
 * scan improvements:
   - bg scan
   - scan flush
   - forced AP scan
 * cfg80211 tracing
 * a bit of new code to allow implementing SAE (secure authentication of
   equals) in managed mode

Along with a few random improvements, features and fixes."

and...

"Please pull from mac80211-next (per below pull request) to get a few
updates. Most important is probably the fix for the WDS regression that
my previous pull request introduced. Other than that, I have some
tracing code, two mesh updates and a change to allow drivers to
calculate the AES CMAC subkeys without having to implement the GF_mulx
operation themselves."

On top of that are the usual updates to iwlwifi, ath9k, rt2x00,
brcmfmac, mwifiex, and a few others here and there.  Of note is the
addition of the ar5523 driver, ported from an original FreeBSD driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0b3ba055 5bdf502d

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -7509,6 +7509,12 @@ S: Maintained 
F:	Documentation/usb/acm.txt

F:	drivers/usb/class/cdc-acm.*



USB AR5523 WIRELESS DRIVER

M:	Pontus Fuchs <pontus.fuchs@gmail.com>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	drivers/net/wireless/ath/ar5523/



USB ATTACHED SCSI

M:	Matthew Wilcox <willy@linux.intel.com>

M:	Sarah Sharp <sarah.a.sharp@linux.intel.com>

arch/mips/bcm47xx/nvram.c

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ static void early_nvram_init(void) 
#ifdef CONFIG_BCM47XX_SSB

	case BCM47XX_BUS_TYPE_SSB:

		mcore_ssb = &bcm47xx_bus.ssb.mipscore;

		base = mcore_ssb->flash_window;

		lim = mcore_ssb->flash_window_size;

		base = mcore_ssb->pflash.window;

		lim = mcore_ssb->pflash.window_size;

		break;

#endif

#ifdef CONFIG_BCM47XX_BCMA

arch/mips/bcm47xx/wgt634u.c

+4 −4
Original line number Diff line number Diff line
@@ -156,10 +156,10 @@ static int __init wgt634u_init(void) 
					    SSB_CHIPCO_IRQ_GPIO);

		}



		wgt634u_flash_data.width = mcore->flash_buswidth;

		wgt634u_flash_resource.start = mcore->flash_window;

		wgt634u_flash_resource.end = mcore->flash_window

					   + mcore->flash_window_size

		wgt634u_flash_data.width = mcore->pflash.buswidth;

		wgt634u_flash_resource.start = mcore->pflash.window;

		wgt634u_flash_resource.end = mcore->pflash.window

					   + mcore->pflash.window_size

					   - 1;

		return platform_add_devices(wgt634u_devices,

					    ARRAY_SIZE(wgt634u_devices));

drivers/bcma/driver_chipcommon.c

+18 −5
Original line number Diff line number Diff line
@@ -22,12 +22,9 @@ static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset, 
	return value;

}



void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)

void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)

{

	u32 leddc_on = 10;

	u32 leddc_off = 90;



	if (cc->setup_done)

	if (cc->early_setup_done)

		return;



	if (cc->core->id.rev >= 11)
@@ -36,6 +33,22 @@ void bcma_core_chipcommon_init(struct bcma_drv_cc *cc) 
	if (cc->core->id.rev >= 35)

		cc->capabilities_ext = bcma_cc_read32(cc, BCMA_CC_CAP_EXT);



	if (cc->capabilities & BCMA_CC_CAP_PMU)

		bcma_pmu_early_init(cc);



	cc->early_setup_done = true;

}



void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)

{

	u32 leddc_on = 10;

	u32 leddc_off = 90;



	if (cc->setup_done)

		return;



	bcma_core_chipcommon_early_init(cc);



	if (cc->core->id.rev >= 20) {

		bcma_cc_write32(cc, BCMA_CC_GPIOPULLUP, 0);

		bcma_cc_write32(cc, BCMA_CC_GPIOPULLDOWN, 0);

drivers/bcma/driver_chipcommon_nflash.c

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ int bcma_nflash_init(struct bcma_drv_cc *cc) 
	}



	cc->nflash.present = true;

	if (cc->core->id.rev == 38 &&

	    (cc->status & BCMA_CC_CHIPST_5357_NAND_BOOT))

		cc->nflash.boot = true;



	/* Prepare platform device, but don't register it yet. It's too early,

	 * malloc (required by device_private_init) is not available yet. */