Merge tag 'nfc-next-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/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>

This commit is contained in:

David S. Miller

2016-01-04 21:48:15 -05:00

parent 197c949e77 c6dc65d885

commit 15ab90f400

34 changed files with 1862 additions and 181 deletions

									
										include/linux/platform_data/microread.h
									
		+1
		-1
	
												View File
												
				@@ -1,5 +1,5 @@

				/*

				 * Driver include for the PN544 NFC chip.

				 * Driver include for the Inside Secure microread NFC Chip.

				 *

				 * Copyright (C) 2011 Tieto Poland

				 * Copyright (C) 2012 Intel Corporation. All rights reserved.