Merge tag 'nfc-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.12 pull request
This is the NFC pull request for 4.12. We have:
- Improvements for the pn533 command queue handling and device
registration order.
- Removal of platform data for the pn544 and st21nfca drivers.
- Additional device tree options to support more trf7970a hardware options.
- Support for Sony's RC-S380P through the port100 driver.
- Removal of the obsolte nfcwilink driver.
- Headers inclusion cleanups (miscdevice.h, unaligned.h) for many drivers.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- Documentation/devicetree/bindings/net/nfc/trf7970a.txt 6 additions, 2 deletionsDocumentation/devicetree/bindings/net/nfc/trf7970a.txt
- MAINTAINERS 0 additions, 2 deletionsMAINTAINERS
- drivers/nfc/Kconfig 0 additions, 11 deletionsdrivers/nfc/Kconfig
- drivers/nfc/Makefile 0 additions, 1 deletiondrivers/nfc/Makefile
- drivers/nfc/fdp/i2c.c 3 additions, 3 deletionsdrivers/nfc/fdp/i2c.c
- drivers/nfc/nfcmrvl/fw_dnld.c 3 additions, 4 deletionsdrivers/nfc/nfcmrvl/fw_dnld.c
- drivers/nfc/nfcmrvl/spi.c 2 additions, 4 deletionsdrivers/nfc/nfcmrvl/spi.c
- drivers/nfc/nfcwilink.c 0 additions, 578 deletionsdrivers/nfc/nfcwilink.c
- drivers/nfc/nxp-nci/firmware.c 1 addition, 1 deletiondrivers/nfc/nxp-nci/firmware.c
- drivers/nfc/nxp-nci/i2c.c 3 additions, 4 deletionsdrivers/nfc/nxp-nci/i2c.c
- drivers/nfc/pn533/i2c.c 21 additions, 13 deletionsdrivers/nfc/pn533/i2c.c
- drivers/nfc/pn533/pn533.c 52 additions, 30 deletionsdrivers/nfc/pn533/pn533.c
- drivers/nfc/pn533/pn533.h 1 addition, 0 deletionsdrivers/nfc/pn533/pn533.h
- drivers/nfc/pn533/usb.c 6 additions, 2 deletionsdrivers/nfc/pn533/usb.c
- drivers/nfc/pn544/i2c.c 43 additions, 178 deletionsdrivers/nfc/pn544/i2c.c
- drivers/nfc/port100.c 29 additions, 15 deletionsdrivers/nfc/port100.c
- drivers/nfc/st21nfca/core.c 6 additions, 6 deletionsdrivers/nfc/st21nfca/core.c
- drivers/nfc/st21nfca/i2c.c 22 additions, 101 deletionsdrivers/nfc/st21nfca/i2c.c
- drivers/nfc/trf7970a.c 76 additions, 22 deletionsdrivers/nfc/trf7970a.c
- include/linux/platform_data/pn544.h 0 additions, 43 deletionsinclude/linux/platform_data/pn544.h
Loading
Please register or sign in to comment