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

Merge tag 'master-2014-07-31' of... 

Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next



Conflicts:
	net/6lowpan/iphc.c

Minor conflicts in iphc.c were changes overlapping with some
style cleanups.

John W. Linville says:

====================
Please pull this last(?) batch of wireless change intended for the
3.17 stream...

For the NFC bits, Samuel says:

"This is a rather quiet one, we have:

- A new driver from ST Microelectronics for their NCI ST21NFCB,
  including device tree  support.

- p2p support for the ST21NFCA driver

- A few fixes an enhancements for the NFC digital laye"

For the Atheros bits, Kalle says:

"Michal and Janusz did some important RX aggregation fixes, basically we
were missing RX reordering altogether. The 10.1 firmware doesn't support
Ad-Hoc mode and Michal fixed ath10k so that it doesn't advertise Ad-Hoc
support with that firmware. Also he implemented a workaround for a KVM
issue."

For the Bluetooth bits, Gustavo and Johan say:

"To quote Gustavo from his previous request:

'Some last minute fixes for -next. We have a fix for a use after free in
RFCOMM, another fix to an issue with ADV_DIRECT_IND and one for ADV_IND with
auto-connection handling.  Last, we added support for reading the codec and
MWS setting for controllers that support these features.'

Additionally there are fixes to LE scanning, an update to conform to the 4.1
core specification as well as fixes for tracking the page scan state. All
of these fixes are important for 3.17."

And,

"We've got:

- 6lowpan fixes/cleanups
- A couple crash fixes, one for the Marvell HCI driver and another in LE SMP.
- Fix for an incorrect connected state check
- Fix for the bondable requirement during pairing (an issue which had
  crept in because of using "pairable" when in fact the actual meaning
  was "bondable" (these have different meanings in Bluetooth)"

Along with those are some late-breaking hardware support patches in
brcmfmac and b43 as well as a stray ath9k patch.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 61ab9efd dc6be9f5

Documentation/devicetree/bindings/net/nfc/st21nfcb.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
* STMicroelectronics SAS. ST21NFCB NFC Controller



Required properties:

- compatible: Should be "st,st21nfcb_i2c".

- clock-frequency: I²C work frequency.

- reg: address on the bus

- interrupt-parent: phandle for the interrupt gpio controller

- interrupts: GPIO interrupt to which the chip is connected

- reset-gpios: Output GPIO pin used to reset the ST21NFCB



Optional SoC Specific Properties:

- pinctrl-names: Contains only one value - "default".

- pintctrl-0: Specifies the pin control groups used for this controller.



Example (for ARM-based BeagleBoard xM with ST21NFCB on I2C2):



&i2c2 {



	status = "okay";



	st21nfcb: st21nfcb@8 {



		compatible = "st,st21nfcb_i2c";



		reg = <0x08>;

		clock-frequency = <400000>;



		interrupt-parent = <&gpio5>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;



		reset-gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>;

	};

};

Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt

0 → 100644
+41 −0
Original line number Diff line number Diff line 
Broadcom BCM43xx Fullmac wireless SDIO devices



This node provides properties for controlling the Broadcom wireless device. The

node is expected to be specified as a child node to the SDIO controller that

connects the device to the system.



Required properties:



 - compatible : Should be "brcm,bcm4329-fmac".



Optional properties:

 - brcm,drive-strength : drive strength used for SDIO pins on device in mA

	(default = 6).

 - interrupt-parent : the phandle for the interrupt controller to which the

	device interrupts are connected.

 - interrupts : specifies attributes for the out-of-band interrupt (host-wake).

	When not specified the device will use in-band SDIO interrupts.

 - interrupt-names : name of the out-of-band interrupt, which must be set

	to "host-wake".



Example:



mmc3: mmc@01c12000 {

	#address-cells = <1>;

	#size-cells = <0>;



	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins_a>;

	vmmc-supply = <&reg_vmmc3>;

	bus-width = <4>;

	non-removable;

	status = "okay";



	brcmf: bcrmf@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

		interrupt-parent = <&pio>;

		interrupts = <10 8>; /* PH10 / EINT10 */

		interrupt-names = "host-wake";

	};

};

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ L: linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers) 
L:	linux-bluetooth@vger.kernel.org

S:	Maintained

F:	net/6lowpan/

F:	include/net/6lowpan.h



6PACK NETWORK DRIVER FOR AX.25

M:	Andreas Koensgen <ajk@comnets.uni-bremen.de>
@@ -5714,7 +5715,8 @@ S: Maintained 
F:	drivers/net/ethernet/marvell/mvneta.*



MARVELL MWIFIEX WIRELESS DRIVER

M:	Bing Zhao <bzhao@marvell.com>

M:	Amitkumar Karwar <akarwar@marvell.com>

M:	Avinash Patil <patila@marvell.com>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	drivers/net/wireless/mwifiex/

drivers/bcma/driver_chipcommon_pmu.c

+1 −0
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid) 
		tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW;

		break;



	case BCMA_CHIP_ID_BCM43131:

	case BCMA_CHIP_ID_BCM43217:

	case BCMA_CHIP_ID_BCM43227:

	case BCMA_CHIP_ID_BCM43228:

drivers/bcma/host_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },

	{ 0, },

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE