linux/drivers/nfc, branch v4.7

NFC: pn533: handle interrupted commands in pn533_recv_frame

2016-05-09T22:01:47Z

When pn533_recv_frame is called from within abort_command context the current dev->cmd is not guaranteed to be set. Additionally on receiving an error status we can omit frame checking and simply schedule the workqueue. Signed-off-by: Michael Thalmeier Signed-off-by: Samuel Ortiz

NFC: pn533: reset poll modulation list before calling targets_found

2016-05-09T22:01:16Z

We need to reset the poll modulation list before calling nfc_targets_found because otherwise userspace could run before the modulation list is cleared and then get a "Cannot activate target while polling" error upon calling activate_target. Signed-off-by: Michael Thalmeier Signed-off-by: Samuel Ortiz

NFC: pn533: i2c: do not call pn533_recv_frame with aborted commands

2016-05-09T21:59:47Z

When a command gets aborted the pn533 core does not need any RX frames that may be received until a new frame is sent. Signed-off-by: Michael Thalmeier Signed-off-by: Samuel Ortiz

NFC: pn533: fix order of initialization

2016-05-09T21:59:18Z

Correctly call nfc_set_parent_dev before nfc_register_device. Otherwise the driver will OOPS when being removed. Signed-off-by: Michael Thalmeier Signed-off-by: Samuel Ortiz

NFC: pn533: i2c: free irq on driver remove

2016-05-09T21:56:23Z

The requested irq needs to be freed when removing the driver, otherwise a following driver load fails to request the irq. Signed-off-by: Michael Thalmeier Signed-off-by: Samuel Ortiz

nfc: st-nci: Move loopback usage from HCI to NCI

2016-05-03T23:51:42Z

NCI provides possible way to run loopback testing has done over HCI. For us it offers many advantages: - It simplifies the code: No more need for a vendor_cmds structure - Loopback over HCI may not be supported in future st-nci firmware Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

nfc: nci: Add an additional parameter to identify a connection id

2016-05-03T23:43:21Z

According to NCI specification, destination type and destination specific parameters shall uniquely identify a single destination for the Logical Connection. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

nfc: st21nfca: Remove duplicated ST21NFCA_ESE_HOST_ID from se.c

2016-05-03T23:40:28Z

ST21NFCA_ESE_HOST_ID is already defined in st21nfca.h. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

nfc: st-nci: Remove redundant ST_NCI_HCI_HOST_ID_ESE from st-nci.h

2016-05-03T23:39:36Z

ST_NCI_HCI_HOST_ID_ESE is already having an equivalent in se.c (ST_NCI_ESE_HOST_ID). Remove and replace where relevant. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

NFC: st-nci: spi: Drop two useless checks in ACPI probe path

2016-05-03T23:38:13Z

When st_nci_spi_acpi_request_resources() gets called we already know that the entries in ->acpi_match_table have matched ACPI ID of the device. In addition spi_device pointer cannot be NULL in any case (otherwise SPI core would not call ->probe() for the driver in the first place). Drop the two useless checks from the driver. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz