2 files changed, 21 insertions, 0 deletions

diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 396fc270ffc3..5f91d4571429 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -66,10 +66,25 @@ static int nfcmrvl_nci_send(struct nci_dev *ndev, struct sk_buff *skb)
         return priv->if_ops->nci_send(priv, 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;
+}
+
 static struct nci_ops nfcmrvl_nci_ops = {
         .open = nfcmrvl_nci_open,
         .close = nfcmrvl_nci_close,
         .send = nfcmrvl_nci_send,
+        .setup = nfcmrvl_nci_setup,
 };
 
 struct nfcmrvl_private *nfcmrvl_nci_register_dev(void *drv_data,
diff --git a/drivers/nfc/nfcmrvl/nfcmrvl.h b/drivers/nfc/nfcmrvl/nfcmrvl.h
index a007175f77fe..54c4a956bd45 100644
--- a/drivers/nfc/nfcmrvl/nfcmrvl.h
+++ b/drivers/nfc/nfcmrvl/nfcmrvl.h
@@ -19,6 +19,12 @@
 /* Define private flags: */
 #define NFCMRVL_NCI_RUNNING                     1
 
+#define NFCMRVL_EXT_COEX_ID                     0xE0
+#define NFCMRVL_NOT_ALLOWED_ID                  0xE1
+#define NFCMRVL_ACTIVE_ID                       0xE2
+#define NFCMRVL_EXT_COEX_ENABLE                 1
+#define NFCMRVL_GPIO_PIN_NFC_NOT_ALLOWED        0xA
+#define NFCMRVL_GPIO_PIN_NFC_ACTIVE             0xB
 #define NFCMRVL_NCI_MAX_EVENT_SIZE              260
 
 struct nfcmrvl_private {