From: mani@kernel.org
To: johan@kernel.org, gregkh@linuxfoundation.org
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
patong.mxl@gmail.com, Manivannan Sadhasivam <mani@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
linux-gpio@vger.kernel.org
Subject: [PATCH v3 2/2] usb: serial: xr_serial: Add gpiochip support
Date: Fri, 1 May 2020 00:19:24 +0530 [thread overview]
Message-ID: <20200430184924.31690-3-mani@kernel.org> (raw)
In-Reply-To: <20200430184924.31690-1-mani@kernel.org>
From: Manivannan Sadhasivam <mani@kernel.org>
Add gpiochip support for Maxlinear/Exar USB to serial converter
for controlling the available gpios.
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-gpio@vger.kernel.org
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
---
drivers/usb/serial/xr_serial.c | 199 ++++++++++++++++++++++++++++++++-
1 file changed, 198 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/serial/xr_serial.c b/drivers/usb/serial/xr_serial.c
index fdb9ddf8bd95..255a30540b52 100644
--- a/drivers/usb/serial/xr_serial.c
+++ b/drivers/usb/serial/xr_serial.c
@@ -7,6 +7,7 @@
* Copyright (c) 2020 Manivannan Sadhasivam <mani@kernel.org>
*/
+#include <linux/gpio/driver.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
@@ -32,6 +33,11 @@ struct xr_uart_regs {
};
struct xr_port_private {
+#ifdef CONFIG_GPIOLIB
+ struct gpio_chip gc;
+ bool gpio_registered;
+ u8 gpio_altfunc;
+#endif
const struct xr_uart_regs *regs;
};
@@ -562,6 +568,196 @@ static void xr_break_ctl(struct tty_struct *tty, int break_state)
state);
}
+#ifdef CONFIG_GPIOLIB
+
+static int xr_gpio_request(struct gpio_chip *gc, unsigned int offset)
+{
+ struct usb_serial_port *port = gpiochip_get_data(gc);
+ struct xr_port_private *port_priv = usb_get_serial_port_data(port);
+
+ /* Check if the requested GPIO is occupied */
+ if (port_priv->gpio_altfunc & BIT(offset))
+ return -ENODEV;
+
+ return 0;
+}
+
+static int xr_gpio_get(struct gpio_chip *gc, unsigned int gpio)
+{
+ struct usb_serial_port *port = gpiochip_get_data(gc);
+ struct xr_port_private *port_priv = usb_get_serial_port_data(port);
+ int ret;
+ u8 gpio_status;
+
+ ret = xr_get_reg(port, XR21V141X_UART_REG_BLOCK,
+ port_priv->regs->gpio_status, &gpio_status);
+ if (ret)
+ return ret;
+
+ return !!(gpio_status & BIT(gpio));
+}
+
+static void xr_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+ struct usb_serial_port *port = gpiochip_get_data(gc);
+ struct xr_port_private *port_priv = usb_get_serial_port_data(port);
+
+ if (val)
+ xr_set_reg(port, XR21V141X_UART_REG_BLOCK,
+ port_priv->regs->gpio_set, BIT(gpio));
+ else
+ xr_set_reg(port, XR21V141X_UART_REG_BLOCK,
+ port_priv->regs->gpio_clr, BIT(gpio));
+}
+
+static int xr_gpio_direction_get(struct gpio_chip *gc, unsigned int gpio)
+{
+ struct usb_serial_port *port = gpiochip_get_data(gc);
+ struct xr_port_private *port_priv = usb_get_serial_port_data(port);
+ int ret;
+ u8 gpio_dir;
+
+ ret = xr_get_reg(port, XR21V141X_UART_REG_BLOCK,
+ port_priv->regs->gpio_dir, &gpio_dir);
+ if (ret)
+ return ret;
+
+ /* Logic 0 = input and Logic 1 = output */
+ return !(gpio_dir & BIT(gpio));
+}
+
+static int xr_gpio_direction_input(struct gpio_chip *gc, unsigned int gpio)
+{
+ struct usb_serial_port *port = gpiochip_get_data(gc);
+ struct xr_port_private *port_priv = usb_get_serial_port_data(port);
+ int ret;
+ u8 gpio_dir;
+
+ ret = xr_get_reg(port, XR21V141X_UART_REG_BLOCK,
+ port_priv->regs->gpio_dir, &gpio_dir);
+ if (ret)
+ return ret;
+
+ gpio_dir &= ~BIT(gpio);
+
+ return xr_set_reg(port, XR21V141X_UART_REG_BLOCK,
+ port_priv->regs->gpio_dir, gpio_dir);
+}
+
+static int xr_gpio_direction_output(struct gpio_chip *gc, unsigned int gpio,
+ int val)
+{
+ struct usb_serial_port *port = gpiochip_get_data(gc);
+ struct xr_port_private *port_priv = usb_get_serial_port_data(port);
+ int ret;
+ u8 gpio_dir;
+
+ ret = xr_get_reg(port, XR21V141X_UART_REG_BLOCK,
+ port_priv->regs->gpio_dir, &gpio_dir);
+ if (ret)
+ return ret;
+
+ gpio_dir |= BIT(gpio);
+
+ ret = xr_set_reg(port, XR21V141X_UART_REG_BLOCK,
+ port_priv->regs->gpio_dir, gpio_dir);
+ if (ret)
+ return ret;
+
+ xr_gpio_set(gc, gpio, val);
+
+ return 0;
+}
+
+static int xr21v141x_gpio_init(struct usb_serial_port *port)
+{
+ struct xr_port_private *port_priv = usb_get_serial_port_data(port);
+ int ret;
+ u8 gpio_mode;
+
+ port_priv->gc.ngpio = 6;
+
+ ret = xr_get_reg(port, XR21V141X_UART_REG_BLOCK,
+ port_priv->regs->gpio_mode, &gpio_mode);
+ if (ret)
+ return ret;
+
+ /* Mark all pins which are not in GPIO mode */
+ if (gpio_mode & UART_MODE_RTS_CTS)
+ port_priv->gpio_altfunc |= (BIT(4) | BIT(5));
+ else if (gpio_mode & UART_MODE_DTR_DSR)
+ port_priv->gpio_altfunc |= (BIT(2) | BIT(3));
+ else if (gpio_mode & UART_MODE_RS485)
+ port_priv->gpio_altfunc |= BIT(5);
+ else if (gpio_mode & UART_MODE_RS485_ADDR)
+ port_priv->gpio_altfunc |= BIT(5);
+ else
+ port_priv->gpio_altfunc = 0; /* All GPIOs are available */
+
+ return ret;
+}
+
+static int xr_gpio_init(struct usb_serial_port *port)
+{
+ struct xr_port_private *port_priv = usb_get_serial_port_data(port);
+ struct usb_serial *serial = port->serial;
+ int ret = 0;
+ u16 pid;
+
+ /* Don't register gpiochip for interface 0 */
+ if (port->minor == 0)
+ return ret;
+
+ pid = le16_to_cpu(serial->dev->descriptor.idProduct);
+
+ ret = xr21v141x_gpio_init(port);
+ if (ret < 0)
+ return ret;
+
+ port_priv->gc.label = devm_kasprintf(&port->dev, GFP_KERNEL, "XR%04x",
+ pid);
+ port_priv->gc.request = xr_gpio_request;
+ port_priv->gc.get_direction = xr_gpio_direction_get;
+ port_priv->gc.direction_input = xr_gpio_direction_input;
+ port_priv->gc.direction_output = xr_gpio_direction_output;
+ port_priv->gc.get = xr_gpio_get;
+ port_priv->gc.set = xr_gpio_set;
+ port_priv->gc.owner = THIS_MODULE;
+ port_priv->gc.parent = &port->dev;
+ port_priv->gc.base = -1;
+ port_priv->gc.can_sleep = true;
+
+ ret = gpiochip_add_data(&port_priv->gc, port);
+ if (!ret)
+ port_priv->gpio_registered = true;
+
+ return ret;
+}
+
+static void xr_gpio_remove(struct usb_serial_port *port)
+{
+ struct xr_port_private *port_priv = usb_get_serial_port_data(port);
+
+ if (port_priv->gpio_registered) {
+ gpiochip_remove(&port_priv->gc);
+ port_priv->gpio_registered = false;
+ }
+}
+
+#else
+
+static int xr_gpio_init(struct usb_serial_port *port)
+{
+ return 0;
+}
+
+static void xr_gpio_remove(struct usb_serial_port *port)
+{
+ /* Nothing to do */
+}
+
+#endif
+
static int xr_port_probe(struct usb_serial_port *port)
{
struct xr_port_private *port_priv;
@@ -575,13 +771,14 @@ static int xr_port_probe(struct usb_serial_port *port)
usb_set_serial_port_data(port, port_priv);
- return 0;
+ return xr_gpio_init(port);
}
static int xr_port_remove(struct usb_serial_port *port)
{
struct xr_port_private *port_priv = usb_get_serial_port_data(port);
+ xr_gpio_remove(port);
kfree(port_priv);
return 0;
--
2.17.1
next prev parent reply other threads:[~2020-04-30 18:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 18:49 [PATCH v3 0/2] Add support for MaxLinear/Exar USB to serial converters mani
2020-04-30 18:49 ` [PATCH v3 1/2] usb: serial: Add MaxLinear/Exar USB to Serial driver mani
2020-05-18 6:07 ` Greg KH
2020-05-19 12:33 ` Johan Hovold
2020-06-06 18:45 ` Manivannan Sadhasivam
2020-04-30 18:49 ` mani [this message]
2020-05-19 13:07 ` [PATCH v3 2/2] usb: serial: xr_serial: Add gpiochip support Johan Hovold
2020-05-27 3:09 ` Manivannan Sadhasivam
2020-05-29 9:00 ` Johan Hovold
2020-05-16 7:06 ` [PATCH v3 0/2] Add support for MaxLinear/Exar USB to serial converters Manivannan Sadhasivam
2020-06-05 11:13 ` Mauro Carvalho Chehab
2020-06-06 12:27 ` Manivannan Sadhasivam
2020-06-05 12:40 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200430184924.31690-3-mani@kernel.org \
--to=mani@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=patong.mxl@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).