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

Commit 4d1cdf1d 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:

====================
Please pull this batch of updates intended for 3.16...

For the mac80211 bits, Johannes says:

"Here I just have Heikki's rfkill GPIO cleanups.

The ARM/tegra patch is OK with the maintainer (Stephen). Let me know of
any problems."

and;

"We have a whole bunch of work on CSA by Andrei, Luca and Michal, but
unfortunately it doesn't seem quite complete yet so it's still disabled.
There's some TDLS work from Arik, and the rest is mostly minor fixes and
cleanups."

For the NFC bits, Samuel says:

"This is the NFC pull request for 3.16. We have:

- STMicroeectronics st21nfca support. The st21nfca is an HCI chipset and
  thus relies on the HCI stack. This submission provides support for tag
  redaer/writer mode (including Type 5) and device tree bindings.

- PM runtime support and a bunch of bug fixes for TI's trf7970a.

- Device tree support for NXP's pn544. Legacy platform data support is
  obviously kept intact.

- NFC Tag type 4B support to the NFC Digital stack.

- SOCK_RAW type support to the raw NFC socket, and allow NCI
  sniffing from that. This can be extended to report HCI frames and also
  proprietarry ones like e.g. the pn533 ones."

For the iwlwifi bits, Emmanuel says:

"Eran continues to work on new devices, Eyal is still digging in
the rate control stuff, and Johannes added new functionality to the
debug system we have in place now along with a few cleanups he made
on the way.  That's pretty much it."

and;

"Avri continues to work on the power code and Eran is improving the
NVM handling as a preparations for new devices on which he works
with Liad. Luca cleans up a bit the code while working on CSA. I have
the regular BT Coex stuff and a small lockdep fix. Johannes has his
regular amount of clean ups and improvements, the main one is the
ability to leave 2 chains open to improve diversity and hence the
throughput in high attenuation scenarios."

and;

"The regular amount of housekeeping here. I merged iwlwifi-fixes.git to
be able to add the patch you didn't want in wireless.git at that stage
of the -rc cycle.  Luca has a few preparations for CSA implementation
and also what seems to be a bugfix for P2P but hasn't caused issues
we could notice."

For the Atheros bits, Kalle says:

"For ath10k Michal did various small fixes on how we handle
hardware/firmware problems and he also fixed two memory leaks."

Also included are a couple of pulls from the wireless tree to
avoid/resolve merge issues...
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 391296c9 9db7cb69

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

0 → 100644
+35 −0
Original line number Diff line number Diff line 
* NXP Semiconductors PN544 NFC Controller



Required properties:

- compatible: Should be "nxp,pn544-i2c".

- clock-frequency: IC work frequency.

- reg: address on the bus

- interrupt-parent: phandle for the interrupt gpio controller

- interrupts: GPIO interrupt to which the chip is connected

- enable-gpios: Output GPIO pin used for enabling/disabling the PN544

- firmware-gpios: Output GPIO pin used to enter firmware download mode



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 BeagleBone with PN544 on I2C2):



&i2c2 {



	status = "okay";



	pn544: pn544@28 {



		compatible = "nxp,pn544-i2c";



		reg = <0x28>;

		clock-frequency = <400000>;



		interrupt-parent = <&gpio1>;

		interrupts = <17 GPIO_ACTIVE_HIGH>;



		enable-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

		firmware-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;

	};

};

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

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



Required properties:

- compatible: Should be "st,st21nfca-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

- enable-gpios: Output GPIO pin used for enabling/disabling the ST21NFCA



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 ST21NFCA on I2C2):



&i2c2 {



	status = "okay";



	st21nfca: st21nfca@1 {



		compatible = "st,st21nfca_i2c";



		reg = <0x01>;

		clock-frequency = <400000>;



		interrupt-parent = <&gpio5>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;



		enable-gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>;

	};

};

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

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties: 
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.



Example (for ARM-based BeagleBone with TRF7970A on SPI1):
@@ -29,6 +30,7 @@ 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>;

		autosuspend-delay = <30000>;

		status = "okay";

	};

};

arch/arm/mach-tegra/board-paz00.c

+1 −3
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 


static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {

	.name	= "wifi_rfkill",

	.reset_gpio	= 25, /* PD1 */

	.shutdown_gpio	= 85, /* PK5 */

	.type	= RFKILL_TYPE_WLAN,

};

arch/mips/bcm47xx/sprom.c

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ static void nvram_read_alpha2(const char *prefix, const char *name, 
static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,

					const char *prefix, bool fallback)

{

	nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);

	nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff, fallback);

	nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff, fallback);

	nvram_read_u8(prefix, NULL, "ledbh2", &sprom->gpio2, 0xff, fallback);