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

Commit 9db7cb69 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
parents 3bea8edd 03c44446

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);