summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorVincent Cuissard <cuissard@marvell.com>2015-06-11 11:25:42 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2015-06-11 23:16:32 +0200
commitd18ee5a5b0926f1a5f6969e9207d9c4f99533f9b (patch)
tree1f0a1ffffde662ed6ac63b0eeba3cc48a51b2a84 /drivers/nfc
parentnfc: st-nci: Rename st21nfcb to st-nci (diff)
downloadlinux-d18ee5a5b0926f1a5f6969e9207d9c4f99533f9b.tar.xz
linux-d18ee5a5b0926f1a5f6969e9207d9c4f99533f9b.zip
NFC: nfcmrvl: remove integration related settings
These settings are related to a specific integration that requires the firmware to drive some GPIOs for external RF coexistency. Since this is really linked to specific hardware integration let's remove them. Signed-off-by: Vincent Cuissard <cuissard@marvell.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/nfcmrvl/main.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index ad4933cefbd1..acb37c0c5d8c 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -68,15 +68,6 @@ static int nfcmrvl_nci_send(struct nci_dev *ndev, struct sk_buff *skb)
static int nfcmrvl_nci_setup(struct nci_dev *ndev)
{
- __u8 val;
-
- val = NFCMRVL_GPIO_PIN_NFC_NOT_ALLOWED;
- nci_set_config(ndev, NFCMRVL_NOT_ALLOWED_ID, 1, &val);
- val = NFCMRVL_GPIO_PIN_NFC_ACTIVE;
- nci_set_config(ndev, NFCMRVL_ACTIVE_ID, 1, &val);
- val = NFCMRVL_EXT_COEX_ENABLE;
- nci_set_config(ndev, NFCMRVL_EXT_COEX_ID, 1, &val);
-
return 0;
}