-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'nfc-next-4.5-1' of git://git.kernel.org/pub/scm/linux/kern…
…el/git/sameo/nfc-next Samuel Ortiz says: ==================== NFC 4.5 pull request This is the first NFC pull request for 4.5 and it brings: - A new driver for the STMicroelectronics ST95HF NFC chipset. The ST95HF is an NFC digital transceiver with an embedded analog front-end and as such relies on the Linux NFC digital implementation. This is the 3rd user of the NFC digital stack. - ACPI support for the ST st-nci and st21nfca drivers. - A small improvement for the nfcsim driver, as we can now tune the Rx delay through sysfs. - A bunch of minor cleanups and small fixes from Christophe Ricard, for a few drivers and the NFC core code. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
- Loading branch information
Showing
34 changed files
with
1,862 additions
and
181 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
* STMicroelectronics : NFC Transceiver ST95HF | ||
|
||
ST NFC Transceiver is required to attach with SPI bus. | ||
ST95HF node should be defined in DT as SPI slave device of SPI | ||
master with which ST95HF transceiver is physically connected. | ||
The properties defined below are required to be the part of DT | ||
to include ST95HF transceiver into the platform. | ||
|
||
Required properties: | ||
=================== | ||
- reg: Address of SPI slave "ST95HF transceiver" on SPI master bus. | ||
|
||
- compatible: should be "st,st95hf" for ST95HF NFC transceiver | ||
|
||
- spi-max-frequency: Max. operating SPI frequency for ST95HF | ||
transceiver. | ||
|
||
- enable-gpio: GPIO line to enable ST95HF transceiver. | ||
|
||
- interrupt-parent : Standard way to specify the controller to which | ||
ST95HF transceiver's interrupt is routed. | ||
|
||
- interrupts : Standard way to define ST95HF transceiver's out | ||
interrupt. | ||
|
||
Optional property: | ||
================= | ||
- st95hfvin-supply : This is an optional property. It contains a | ||
phandle to ST95HF transceiver's regulator supply node in DT. | ||
|
||
Example: | ||
======= | ||
spi@9840000 { | ||
reg = <0x9840000 0x110>; | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
cs-gpios = <&pio0 4>; | ||
status = "okay"; | ||
|
||
st95hf@0{ | ||
reg = <0>; | ||
compatible = "st,st95hf"; | ||
status = "okay"; | ||
spi-max-frequency = <1000000>; | ||
enable-gpio = <&pio4 0>; | ||
interrupt-parent = <&pio0>; | ||
interrupts = <7 IRQ_TYPE_EDGE_FALLING>; | ||
}; | ||
|
||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.