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

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

Merge tag 'master-2014-10-02' of... 

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



John W. Linville says:

====================
pull request: wireless-next 2014-10-03

Please pull tihs batch of updates intended for the 3.18 stream!

For the iwlwifi bits, Emmanuel says:

"I have here a few things that depend on the latest mac80211's changes:
RRM, TPC, Quiet Period etc...  Eyal keeps improving our rate control
and we have a new device ID. This last patch should probably have
gone to wireless.git, but at that stage, I preferred to send it to
-next and CC stable."

For (most of) the Atheros bits, Kalle says:

"The only new feature is testmode support from me. Ben added a new method
to crash the firmware with an assert for debug purposes. As usual, we
have lots of smaller fixes from Michal. Matteo fixed a Kconfig
dependency with debugfs. I fixed some warnings recently added to
checkpatch."

For the NFC bits, Samuel says:

"We've had major updates for TI and ST Microelectronics drivers, and a
few NCI related changes.

For TI's trf7970a driver:

- Target mode support for trf7970a
- Suspend/resume support for trf7970a
- DT properties additions to handle different quirks
- A bunch of fixes for smartphone IOP related issues

For ST Microelectronics' ST21NFCA and ST21NFCB drivers:

- ISO15693 support for st21nfcb
- checkpatch and sparse related warning fixes
- Code cleanups and a few minor fixes

Finally, Marvell added ISO15693 support to the NCI stack, together with a
couple of NCI fixes."

For the Bluetooth bits, Johan says:

"This 3.18 pull request replaces the one I did on Monday ("bluetooth-next
2014-09-22", which hasn't been pulled yet). The additions since the last
request are:

 - SCO connection fix for devices not supporting eSCO
 - Cleanups regarding the SCO establishment logic
 - Remove unnecessary return value from logging functions
 - Header compression fix for 6lowpan
 - Cleanups to the ieee802154/mrf24j40 driver

Here's a copy from previous request that this one replaces:

'
Here are some more patches for 3.18. They include various fixes to the
btusb HCI driver, a fix for LE SMP, as well as adding Jukka to the
MAINTAINERS file for generic 6LoWPAN (as requested by Alexander Aring).

I've held on to this pull request a bit since we were waiting for a SCO
related fix to get sorted out first. However, since the merge window is
getting closer I decided not to wait for it. If we do get the fix sorted
out there'll probably be a second small pull request later this week.
'"

And,

"Unless 3.17 gets delayed this will probably be our last -next pull request for
3.18. We've got:

  - New Marvell hardware supportr
  - Multicast support for 6lowpan
  - Several of 6lowpan fixes & cleanups
  - Fix for a (false-positive) lockdep warning in L2CAP
  - Minor btusb cleanup"

On top of all that comes the usual sort of updates to ath5k, ath9k,
ath10k, brcmfmac, mwifiex, and wil6210.  This time around there are
also a number of rtlwifi updates to enable some new hardware and
to reconcile the in-kernel drivers with some newer releases of the
Realtek vendor drivers.  Also of note is some device tree work for
the bcma bus.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 61b37d2f 3f08e472

Documentation/devicetree/bindings/bus/bcma.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
Driver for ARM AXI Bus with Broadcom Plugins (bcma)



Required properties:



- compatible : brcm,bus-axi



- reg : iomem address range of chipcommon core



The cores on the AXI bus are automatically detected by bcma with the

memory ranges they are using and they get registered afterwards.



The top-level axi bus may contain children representing attached cores

(devices). This is needed since some hardware details can't be auto

detected (e.g. IRQ numbers). Also some of the cores may be responsible

for extra things, e.g. ChipCommon providing access to the GPIO chip.



Example:



	axi@18000000 {

		compatible = "brcm,bus-axi";

		reg = <0x18000000 0x1000>;

		ranges = <0x00000000 0x18000000 0x00100000>;

		#address-cells = <1>;

		#size-cells = <1>;



		chipcommon {

			reg = <0x00000000 0x1000>;



			gpio-controller;

			#gpio-cells = <2>;

		};

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ Example (for ARM-based BeagleBoard xM with ST21NFCB on I2C2): 
		clock-frequency = <400000>;



		interrupt-parent = <&gpio5>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;



		reset-gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>;

	};

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

+8 −0
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ Optional SoC Specific Properties: 
- pinctrl-names: Contains only one value - "default".

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

- autosuspend-delay: Specify autosuspend delay in milliseconds.

- vin-voltage-override: Specify voltage of VIN pin in microvolts.

- irq-status-read-quirk: Specify that the trf7970a being used has the

  "IRQ Status Read" erratum.

- en2-rf-quirk: Specify that the trf7970a being used has the "EN2 RF"

  erratum.



Example (for ARM-based BeagleBone with TRF7970A on SPI1):
@@ -30,7 +35,10 @@ Example (for ARM-based BeagleBone with TRF7970A on SPI1): 
		ti,enable-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>,

				  <&gpio2 5 GPIO_ACTIVE_LOW>;

		vin-supply = <&ldo3_reg>;

		vin-voltage-override = <5000000>;

		autosuspend-delay = <30000>;

		irq-status-read-quirk;

		en2-rf-quirk;

		status = "okay";

	};

};

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ F: drivers/scsi/53c700* 


6LOWPAN GENERIC (BTLE/IEEE 802.15.4)

M:	Alexander Aring <alex.aring@gmail.com>

M:	Jukka Rissanen <jukka.rissanen@linux.intel.com>

L:	linux-bluetooth@vger.kernel.org

L:	linux-wpan@vger.kernel.org

S:	Maintained
@@ -1616,6 +1617,7 @@ L: wil6210@qca.qualcomm.com 
S:	Supported

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

F:	drivers/net/wireless/ath/wil6210/

F:	include/uapi/linux/wil6210_uapi.h



CARL9170 LINUX COMMUNITY WIRELESS DRIVER

M:	Christian Lamparter <chunkeey@googlemail.com>
@@ -7494,13 +7496,12 @@ F: drivers/video/fbdev/aty/aty128fb.c 


RALINK RT2X00 WIRELESS LAN DRIVER

P:	rt2x00 project

M:	Ivo van Doorn <IvDoorn@gmail.com>

M:	Stanislaw Gruszka <sgruszka@redhat.com>

M:	Helmut Schaa <helmut.schaa@googlemail.com>

L:	linux-wireless@vger.kernel.org

L:	users@rt2x00.serialmonkey.com (moderated for non-subscribers)

W:	http://rt2x00.serialmonkey.com/

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git

F:	drivers/net/wireless/rt2x00/



RAMDISK RAM BLOCK DEVICE DRIVER

drivers/bcma/bcma_private.h

+14 −0
Original line number Diff line number Diff line
@@ -88,6 +88,20 @@ extern int __init bcma_host_pci_init(void); 
extern void __exit bcma_host_pci_exit(void);

#endif /* CONFIG_BCMA_HOST_PCI */



/* host_soc.c */

#if defined(CONFIG_BCMA_HOST_SOC) && defined(CONFIG_OF)

extern int __init bcma_host_soc_register_driver(void);

extern void __exit bcma_host_soc_unregister_driver(void);

#else

static inline int __init bcma_host_soc_register_driver(void)

{

	return 0;

}

static inline void __exit bcma_host_soc_unregister_driver(void)

{

}

#endif /* CONFIG_BCMA_HOST_SOC && CONFIG_OF */



/* driver_pci.c */

u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address);