7 files changed, 284 insertions, 1 deletions

diff --git a/Documentation/devicetree/bindings/net/nfc/nfcmrvl.txt b/Documentation/devicetree/bindings/net/nfc/nfcmrvl.txt
new file mode 100644
index 000000000000..7c4a0cc370cf
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/nfc/nfcmrvl.txt
@@ -0,0 +1,29 @@
+* Marvell International Ltd. NCI NFC Controller
+
+Required properties:
+- compatible: Should be "mrvl,nfc-uart".
+
+Optional SoC specific properties:
+- pinctrl-names: Contains only one value - "default".
+- pintctrl-0: Specifies the pin control groups used for this controller.
+- reset-n-io: Output GPIO pin used to reset the chip (active low).
+- hci-muxed: Specifies that the chip is muxing NCI over HCI frames.
+
+Optional UART-based chip specific properties:
+- flow-control: Specifies that the chip is using RTS/CTS.
+- break-control: Specifies that the chip needs specific break management.
+
+Example (for ARM-based BeagleBoard Black with 88W8887 on UART5):
+
+&uart5 {
+        status = "okay";
+
+        nfcmrvluart: nfcmrvluart@5 {
+                compatible = "mrvl,nfc-uart";
+
+                reset-n-io = <&gpio3 16 0>;
+
+                hci-muxed;
+                flow-control;
+        }
+};
diff --git a/drivers/nfc/nfcmrvl/Kconfig b/drivers/nfc/nfcmrvl/Kconfig
index 5e18afd9abe2..796be2411440 100644
--- a/drivers/nfc/nfcmrvl/Kconfig
+++ b/drivers/nfc/nfcmrvl/Kconfig
@@ -21,3 +21,14 @@ config NFC_MRVL_USB
 
           Say Y here to compile support for Marvell NFC-over-USB driver
           into the kernel or say M to compile it as module.
+
+config NFC_MRVL_UART
+        tristate "Marvell NFC-over-UART driver"
+        depends on NFC_MRVL && NFC_NCI_UART
+        help
+          Marvell NFC-over-UART driver.
+
+          This driver provides support for Marvell NFC-over-UART devices
+
+          Say Y here to compile support for Marvell NFC-over-UART driver
+          into the kernel or say M to compile it as module.
diff --git a/drivers/nfc/nfcmrvl/Makefile b/drivers/nfc/nfcmrvl/Makefile
index 97a0de72dc01..775196274d1f 100644
--- a/drivers/nfc/nfcmrvl/Makefile
+++ b/drivers/nfc/nfcmrvl/Makefile
@@ -7,3 +7,6 @@ obj-$(CONFIG_NFC_MRVL) += nfcmrvl.o
 
 nfcmrvl_usb-y += usb.o
 obj-$(CONFIG_NFC_MRVL_USB) += nfcmrvl_usb.o
+
+nfcmrvl_uart-y += uart.o
+obj-$(CONFIG_NFC_MRVL_UART) += nfcmrvl_uart.o
diff --git a/drivers/nfc/nfcmrvl/nfcmrvl.h b/drivers/nfc/nfcmrvl/nfcmrvl.h
index 214412bd6110..09780d57c9b8 100644
--- a/drivers/nfc/nfcmrvl/nfcmrvl.h
+++ b/drivers/nfc/nfcmrvl/nfcmrvl.h
@@ -43,6 +43,11 @@
 #define NFCMRVL_HCI_OGF                         0x81
 #define NFCMRVL_HCI_OCF                         0xFE
 
+enum nfcmrvl_phy {
+        NFCMRVL_PHY_USB         = 0,
+        NFCMRVL_PHY_UART        = 1,
+};
+
 
 struct nfcmrvl_private {
 
@@ -61,6 +66,8 @@ struct nfcmrvl_private {
         void *drv_data;
         /* PHY device */
         struct device *dev;
+        /* PHY type */
+        enum nfcmrvl_phy phy;
         /* Low level driver ops */
         struct nfcmrvl_if_ops *if_ops;
 };
diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
new file mode 100644
index 000000000000..61442d6528a6
--- /dev/null
+++ b/drivers/nfc/nfcmrvl/uart.c
@@ -0,0 +1,225 @@
+/**
+ * Marvell NFC-over-UART driver
+ *
+ * Copyright (C) 2015, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available on the worldwide web at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/of_gpio.h>
+#include <net/nfc/nci.h>
+#include <net/nfc/nci_core.h>
+#include "nfcmrvl.h"
+
+static unsigned int hci_muxed;
+static unsigned int flow_control;
+static unsigned int break_control;
+static unsigned int reset_n_io;
+
+/*
+** NFCMRVL NCI OPS
+*/
+
+static int nfcmrvl_uart_nci_open(struct nfcmrvl_private *priv)
+{
+        return 0;
+}
+
+static int nfcmrvl_uart_nci_close(struct nfcmrvl_private *priv)
+{
+        return 0;
+}
+
+static int nfcmrvl_uart_nci_send(struct nfcmrvl_private *priv,
+                                 struct sk_buff *skb)
+{
+        struct nci_uart *nu = priv->drv_data;
+
+        return nu->ops.send(nu, skb);
+}
+
+static struct nfcmrvl_if_ops uart_ops = {
+        .nci_open = nfcmrvl_uart_nci_open,
+        .nci_close = nfcmrvl_uart_nci_close,
+        .nci_send = nfcmrvl_uart_nci_send,
+};
+
+#ifdef CONFIG_OF
+
+static int nfcmrvl_uart_parse_dt(struct device_node *node,
+                                 struct nfcmrvl_platform_data *pdata)
+{
+        struct device_node *matched_node;
+        int ret;
+
+        matched_node = of_find_compatible_node(node, NULL, "mrvl,nfc-uart");
+        if (!matched_node)
+                return -ENODEV;
+
+        ret = nfcmrvl_parse_dt(matched_node, pdata);
+        if (ret < 0) {
+                pr_err("Failed to get generic entries\n");
+                return ret;
+        }
+
+        if (of_find_property(matched_node, "flow-control", NULL))
+                pdata->flow_control = 1;
+        else
+                pdata->flow_control = 0;
+
+        if (of_find_property(matched_node, "break-control", NULL))
+                pdata->break_control = 1;
+        else
+                pdata->break_control = 0;
+
+        return 0;
+}
+
+#else
+
+static int nfcmrvl_uart_parse_dt(struct device_node *node,
+                                 struct nfcmrvl_platform_data *pdata)
+{
+        return -ENODEV;
+}
+
+#endif
+
+/*
+** NCI UART OPS
+*/
+
+static int nfcmrvl_nci_uart_open(struct nci_uart *nu)
+{
+        struct nfcmrvl_private *priv;
+        struct nfcmrvl_platform_data *pdata = NULL;
+        struct nfcmrvl_platform_data config;
+
+        /*
+         * Platform data cannot be used here since usually it is already used
+         * by low level serial driver. We can try to retrieve serial device
+         * and check if DT entries were added.
+         */
+
+        if (nu->tty->dev->parent && nu->tty->dev->parent->of_node)
+                if (nfcmrvl_uart_parse_dt(nu->tty->dev->parent->of_node,
+                                          &config) == 0)
+                        pdata = &config;
+