summaryrefslogtreecommitdiff
path: root/drivers/nfc/nfcmrvl/main.c
diff options
context:
space:
mode:
authorVincent Cuissard <cuissard@marvell.com>2015-10-26 12:27:44 +0300
committerSamuel Ortiz <sameo@linux.intel.com>2015-10-27 06:24:35 +0300
commitcaf6e49bf6d02e6bb94df680bbe3beaf680fdefa (patch)
tree94c3e0be315322c66ed2347fb52666b5d81ede75 /drivers/nfc/nfcmrvl/main.c
parent2bd832459a0827b8dcf13b345380b66f92089d74 (diff)
downloadlinux-caf6e49bf6d02e6bb94df680bbe3beaf680fdefa.tar.xz
NFC: nfcmrvl: add spi driver
This driver adds the support of SPI-based Marvell NFC controller. Signed-off-by: Vincent Cuissard <cuissard@marvell.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/nfcmrvl/main.c')
-rw-r--r--drivers/nfc/nfcmrvl/main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 0c27de60a6bd..8079ae0de21e 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -132,7 +132,11 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy,
nfc_err(dev, "failed to request reset_n io\n");
}
- headroom = tailroom = 0;
+ if (phy == NFCMRVL_PHY_SPI) {
+ headroom = NCI_SPI_HDR_LEN;
+ tailroom = 1;
+ } else
+ headroom = tailroom = 0;
if (priv->config.hci_muxed)
headroom += NFCMRVL_HCI_EVENT_HEADER_SIZE;