Merge tag 'driver-core-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / nfc / nfcmrvl / main.c

diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index ad4933cefbd1b2c60ae5ef23aeece275d2fcf0fd..4a8866d62941202ee94a697f4ec78729772b8758 100644 (file)
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -17,6 +17,9 @@
  */
 
 #include <linux/module.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/of_gpio.h>
 #include <linux/nfc.h>
 #include <net/nfc/nci.h>
 #include <net/nfc/nci_core.h>
@@ -63,20 +66,25 @@ static int nfcmrvl_nci_send(struct nci_dev *ndev, struct sk_buff *skb)
        if (!test_bit(NFCMRVL_NCI_RUNNING, &priv->flags))
                return -EBUSY;
 
+       if (priv->config.hci_muxed) {
+               unsigned char *hdr;
+               unsigned char len = skb->len;
+
+               hdr = (char *) skb_push(skb, NFCMRVL_HCI_EVENT_HEADER_SIZE);
+               hdr[0] = NFCMRVL_HCI_COMMAND_CODE;
+               hdr[1] = NFCMRVL_HCI_OGF;
+               hdr[2] = NFCMRVL_HCI_OCF;
+               hdr[3] = len;
+       }
+
        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);
+       __u8 val = 1;
 
+       nci_set_config(ndev, NFCMRVL_PB_BAIL_OUT, 1, &val);
        return 0;
 }
 
@@ -88,11 +96,13 @@ static struct nci_ops nfcmrvl_nci_ops = {
 };
 
 struct nfcmrvl_private *nfcmrvl_nci_register_dev(void *drv_data,
-                                                struct nfcmrvl_if_ops *ops,
-                                                struct device *dev)
+                               struct nfcmrvl_if_ops *ops,
+                               struct device *dev,
+                               struct nfcmrvl_platform_data *pdata)
 {
        struct nfcmrvl_private *priv;
        int rc;
+       int headroom = 0;
        u32 protocols;
 
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
@@ -103,13 +113,30 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(void *drv_data,
        priv->if_ops = ops;
        priv->dev = dev;
 
+       memcpy(&priv->config, pdata, sizeof(*pdata));
+
+       if (priv->config.reset_n_io) {
+               rc = devm_gpio_request_one(dev,
+                                          priv->config.reset_n_io,
+                                          GPIOF_OUT_INIT_LOW,
+                                          "nfcmrvl_reset_n");
+               if (rc < 0)
+                       nfc_err(dev, "failed to request reset_n io\n");
+       }
+
+       if (priv->config.hci_muxed)
+               headroom = NFCMRVL_HCI_EVENT_HEADER_SIZE;
+
        protocols = NFC_PROTO_JEWEL_MASK
-               | NFC_PROTO_MIFARE_MASK | NFC_PROTO_FELICA_MASK
+               | NFC_PROTO_MIFARE_MASK
+               | NFC_PROTO_FELICA_MASK
                | NFC_PROTO_ISO14443_MASK
                | NFC_PROTO_ISO14443_B_MASK
+               | NFC_PROTO_ISO15693_MASK
                | NFC_PROTO_NFC_DEP_MASK;
 
-       priv->ndev = nci_allocate_device(&nfcmrvl_nci_ops, protocols, 0, 0);
+       priv->ndev = nci_allocate_device(&nfcmrvl_nci_ops, protocols,
+                                        headroom, 0);
        if (!priv->ndev) {
                nfc_err(dev, "nci_allocate_device failed\n");
                rc = -ENOMEM;
@@ -118,6 +145,8 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(void *drv_data,
 
        nci_set_drvdata(priv->ndev, priv);
 
+       nfcmrvl_chip_reset(priv);
+
        rc = nci_register_device(priv->ndev);
        if (rc) {
                nfc_err(dev, "nci_register_device failed %d\n", rc);
@@ -144,21 +173,84 @@ void nfcmrvl_nci_unregister_dev(struct nfcmrvl_private *priv)
 }
 EXPORT_SYMBOL_GPL(nfcmrvl_nci_unregister_dev);
 
-int nfcmrvl_nci_recv_frame(struct nfcmrvl_private *priv, void *data, int count)
+int nfcmrvl_nci_recv_frame(struct nfcmrvl_private *priv, struct sk_buff *skb)
 {
-       struct sk_buff *skb;
-
-       skb = nci_skb_alloc(priv->ndev, count, GFP_ATOMIC);
-       if (!skb)
-               return -ENOMEM;
+       if (priv->config.hci_muxed) {
+               if (skb->data[0] == NFCMRVL_HCI_EVENT_CODE &&
+                   skb->data[1] == NFCMRVL_HCI_NFC_EVENT_CODE) {
+                       /* Data packet, let's extract NCI payload */
+                       skb_pull(skb, NFCMRVL_HCI_EVENT_HEADER_SIZE);
+               } else {
+                       /* Skip this packet */
+                       kfree_skb(skb);
+                       return 0;
+               }
+       }
 
-       memcpy(skb_put(skb, count), data, count);
-       nci_recv_frame(priv->ndev, skb);
+       if (test_bit(NFCMRVL_NCI_RUNNING, &priv->flags))
+               nci_recv_frame(priv->ndev, skb);
+       else {
+               /* Drop this packet since nobody wants it */
+               kfree_skb(skb);
+               return 0;
+       }
 
-       return count;
+       return 0;
 }
 EXPORT_SYMBOL_GPL(nfcmrvl_nci_recv_frame);
 
+void nfcmrvl_chip_reset(struct nfcmrvl_private *priv)
+{
+       /*
+        * This function does not take care if someone is using the device.
+        * To be improved.
+        */
+
+       if (priv->config.reset_n_io) {
+               nfc_info(priv->dev, "reset the chip\n");
+               gpio_set_value(priv->config.reset_n_io, 0);
+               usleep_range(5000, 10000);
+               gpio_set_value(priv->config.reset_n_io, 1);
+       } else
+               nfc_info(priv->dev, "no reset available on this interface\n");
+}
+
+#ifdef CONFIG_OF
+
+int nfcmrvl_parse_dt(struct device_node *node,
+                    struct nfcmrvl_platform_data *pdata)
+{
+       int reset_n_io;
+
+       reset_n_io = of_get_named_gpio(node, "reset-n-io", 0);
+       if (reset_n_io < 0) {
+               pr_info("no reset-n-io config\n");
+               reset_n_io = 0;
+       } else if (!gpio_is_valid(reset_n_io)) {
+               pr_err("invalid reset-n-io GPIO\n");
+               return reset_n_io;
+       }
+       pdata->reset_n_io = reset_n_io;
+
+       if (of_find_property(node, "hci-muxed", NULL))
+               pdata->hci_muxed = 1;
+       else
+               pdata->hci_muxed = 0;
+
+       return 0;
+}
+
+#else
+
+int nfcmrvl_parse_dt(struct device_node *node,
+                    struct nfcmrvl_platform_data *pdata)
+{
+       return -ENODEV;
+}
+
+#endif
+EXPORT_SYMBOL_GPL(nfcmrvl_parse_dt);
+
 MODULE_AUTHOR("Marvell International Ltd.");
 MODULE_DESCRIPTION("Marvell NFC driver ver " VERSION);
 MODULE_VERSION(VERSION);