Merge tag 'nfc-next-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.2 pull request
This is the NFC pull request for 4.2.
- NCI drivers can now define their own handlers for processing
proprietary NCI responses and notifications.
- NFC vendors can use a dedicated netlink API to send their own
proprietary commands, like e.g. all commands needed to implement
vendor specific manufacturing tools.
- A new generic NCI over UART driver against which any NCI chipset
running on top of a serial interface can register.
- The st21nfcb driver is renamed to st-nci as it can and will support
most of ST Microelectronics NCI chipsets.
- The st21nfcb driver can put its CLF in hibernate mode and save
significant amount of power.
- A few st21nfcb minor fixes.
- The NXP NCI driver now supports ACPI enumeration.
- The Marvell NCI driver now supports both USB and serial
physical interfaces.
- The Marvell NCI drivers also supports NCI frames being muxed
over HCI. This is a setting that can be defined by a DT property.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- Documentation/devicetree/bindings/net/nfc/nfcmrvl.txt 29 additions, 0 deletionsDocumentation/devicetree/bindings/net/nfc/nfcmrvl.txt
- Documentation/devicetree/bindings/net/nfc/st-nci.txt 2 additions, 2 deletionsDocumentation/devicetree/bindings/net/nfc/st-nci.txt
- Documentation/devicetree/bindings/net/nfc/trf7970a.txt 4 additions, 0 deletionsDocumentation/devicetree/bindings/net/nfc/trf7970a.txt
- Documentation/nfc/nfc-hci.txt 1 addition, 1 deletionDocumentation/nfc/nfc-hci.txt
- drivers/nfc/Kconfig 1 addition, 1 deletiondrivers/nfc/Kconfig
- drivers/nfc/Makefile 1 addition, 3 deletionsdrivers/nfc/Makefile
- drivers/nfc/microread/i2c.c 0 additions, 3 deletionsdrivers/nfc/microread/i2c.c
- drivers/nfc/nfcmrvl/Kconfig 11 additions, 0 deletionsdrivers/nfc/nfcmrvl/Kconfig
- drivers/nfc/nfcmrvl/Makefile 3 additions, 0 deletionsdrivers/nfc/nfcmrvl/Makefile
- drivers/nfc/nfcmrvl/main.c 113 additions, 21 deletionsdrivers/nfc/nfcmrvl/main.c
- drivers/nfc/nfcmrvl/nfcmrvl.h 56 additions, 4 deletionsdrivers/nfc/nfcmrvl/nfcmrvl.h
- drivers/nfc/nfcmrvl/uart.c 225 additions, 0 deletionsdrivers/nfc/nfcmrvl/uart.c
- drivers/nfc/nfcmrvl/usb.c 21 additions, 6 deletionsdrivers/nfc/nfcmrvl/usb.c
- drivers/nfc/nxp-nci/Makefile 0 additions, 2 deletionsdrivers/nfc/nxp-nci/Makefile
- drivers/nfc/nxp-nci/i2c.c 52 additions, 0 deletionsdrivers/nfc/nxp-nci/i2c.c
- drivers/nfc/pn544/i2c.c 11 additions, 32 deletionsdrivers/nfc/pn544/i2c.c
- drivers/nfc/st-nci/Kconfig 23 additions, 0 deletionsdrivers/nfc/st-nci/Kconfig
- drivers/nfc/st-nci/Makefile 9 additions, 0 deletionsdrivers/nfc/st-nci/Makefile
- drivers/nfc/st-nci/core.c 179 additions, 0 deletionsdrivers/nfc/st-nci/core.c
- drivers/nfc/st-nci/i2c.c 67 additions, 80 deletionsdrivers/nfc/st-nci/i2c.c
Please register or sign in to comment