1 files changed, 52 insertions, 14 deletions

diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 708aad28c567..e317a69a4560 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -19,6 +19,7 @@
 #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>
@@ -65,7 +66,7 @@ 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->hci_muxed) {
+        if (priv->config.hci_muxed) {
                 unsigned char *hdr;
                 unsigned char len = skb->len;
 
@@ -92,9 +93,9 @@ 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,
-                                                 unsigned int flags)
+                                struct nfcmrvl_if_ops *ops,
+                                struct device *dev,
+                                struct nfcmrvl_platform_data *pdata)
 {
         struct nfcmrvl_private *priv;
         int rc;
@@ -108,23 +109,24 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(void *drv_data,
         priv->drv_data = drv_data;
         priv->if_ops = ops;
         priv->dev = dev;
-        priv->hci_muxed = (flags & NFCMRVL_DEV_FLAG_HCI_MUXED) ? 1 : 0;
-        priv->reset_n_io = NFCMRVL_DEV_FLAG_GET_RESET_N_IO(flags);
 
-        if (priv->reset_n_io) {
+        memcpy(&priv->config, pdata, sizeof(*pdata));
+
+        if (priv->config.reset_n_io) {
                 rc = devm_gpio_request_one(dev,
-                                           priv->reset_n_io,
+                                           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->hci_muxed)
+        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_NFC_DEP_MASK;
@@ -169,7 +171,7 @@ EXPORT_SYMBOL_GPL(nfcmrvl_nci_unregister_dev);
 
 int nfcmrvl_nci_recv_frame(struct nfcmrvl_private *priv, struct sk_buff *skb)
 {
-        if (priv->hci_muxed) {
+        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 */
@@ -200,15 +202,51 @@ void nfcmrvl_chip_reset(struct nfcmrvl_private *priv)
          * To be improved.
          */
 
-        if (priv->reset_n_io) {
+        if (priv->config.reset_n_io) {
                 nfc_info(priv->dev, "reset the chip\n");
-                gpio_set_value(priv->reset_n_io, 0);
+                gpio_set_value(priv->config.reset_n_io, 0);
                 usleep_range(5000, 10000);
-                gpio_set_value(priv->reset_n_io, 1);
+                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);