From: Hugo Villeneuve <hugo@hugovil.com>
To: gregkh@linuxfoundation.org, robh+dt@kernel.org,
krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org,
jirislaby@kernel.org, jringle@gridpoint.com,
jesse.sung@canonical.com, isaac.true@canonical.com,
l.perczak@camlintechnologies.com, tomasz.mon@camlingroup.com
Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, hugo@hugovil.com,
linux-gpio@vger.kernel.org,
Hugo Villeneuve <hvilleneuve@dimonoff.com>,
stable@vger.kernel.org,
Lech Perczak <lech.perczak@camlingroup.com>
Subject: [PATCH v8 04/10] serial: sc16is7xx: refactor GPIO controller registration
Date: Wed, 7 Jun 2023 10:05:18 -0400 [thread overview]
Message-ID: <20230607140525.833982-5-hugo@hugovil.com> (raw)
In-Reply-To: <20230607140525.833982-1-hugo@hugovil.com>
From: Hugo Villeneuve <hvilleneuve@dimonoff.com>
In preparation for upcoming patch "fix regression with GPIO
configuration". To facilitate review and make code more modular.
Cc: <stable@vger.kernel.org> # 6.1.x
Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com>
Reviewed-by: Lech Perczak <lech.perczak@camlingroup.com>
Tested-by: Lech Perczak <lech.perczak@camlingroup.com>
---
drivers/tty/serial/sc16is7xx.c | 40 ++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index 9e9856846643..f5b4d2d18a71 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -332,6 +332,7 @@ struct sc16is7xx_one {
struct sc16is7xx_port {
const struct sc16is7xx_devtype *devtype;
+ struct device *dev;
struct regmap *regmap;
struct clk *clk;
#ifdef CONFIG_GPIOLIB
@@ -1349,6 +1350,25 @@ static int sc16is7xx_gpio_direction_output(struct gpio_chip *chip,
return 0;
}
+
+static int sc16is7xx_setup_gpio_chip(struct sc16is7xx_port *s)
+{
+ if (!s->devtype->nr_gpio)
+ return 0;
+
+ s->gpio.owner = THIS_MODULE;
+ s->gpio.parent = s->dev;
+ s->gpio.label = dev_name(s->dev);
+ s->gpio.direction_input = sc16is7xx_gpio_direction_input;
+ s->gpio.get = sc16is7xx_gpio_get;
+ s->gpio.direction_output = sc16is7xx_gpio_direction_output;
+ s->gpio.set = sc16is7xx_gpio_set;
+ s->gpio.base = -1;
+ s->gpio.ngpio = s->devtype->nr_gpio;
+ s->gpio.can_sleep = 1;
+
+ return gpiochip_add_data(&s->gpio, s);
+}
#endif
static const struct serial_rs485 sc16is7xx_rs485_supported = {
@@ -1412,6 +1432,7 @@ static int sc16is7xx_probe(struct device *dev,
s->regmap = regmap;
s->devtype = devtype;
+ s->dev = dev;
dev_set_drvdata(dev, s);
mutex_init(&s->efr_lock);
@@ -1502,22 +1523,9 @@ static int sc16is7xx_probe(struct device *dev,
}
#ifdef CONFIG_GPIOLIB
- if (devtype->nr_gpio) {
- /* Setup GPIO cotroller */
- s->gpio.owner = THIS_MODULE;
- s->gpio.parent = dev;
- s->gpio.label = dev_name(dev);
- s->gpio.direction_input = sc16is7xx_gpio_direction_input;
- s->gpio.get = sc16is7xx_gpio_get;
- s->gpio.direction_output = sc16is7xx_gpio_direction_output;
- s->gpio.set = sc16is7xx_gpio_set;
- s->gpio.base = -1;
- s->gpio.ngpio = devtype->nr_gpio;
- s->gpio.can_sleep = 1;
- ret = gpiochip_add_data(&s->gpio, s);
- if (ret)
- goto out_ports;
- }
+ ret = sc16is7xx_setup_gpio_chip(s);
+ if (ret)
+ goto out_ports;
#endif
/*
--
2.30.2
next prev parent reply other threads:[~2023-06-07 14:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 14:05 [PATCH v8 00/10] serial: sc16is7xx: fix GPIO regression and rs485 improvements Hugo Villeneuve
2023-06-07 14:05 ` [PATCH v8 01/10] serial: sc16is7xx: fix broken port 0 uart init Hugo Villeneuve
2023-06-07 14:05 ` [PATCH v8 02/10] serial: sc16is7xx: mark IOCONTROL register as volatile Hugo Villeneuve
2023-06-07 14:05 ` [PATCH v8 03/10] serial: sc16is7xx: remove obsolete out_thread label Hugo Villeneuve
2023-06-07 14:05 ` Hugo Villeneuve [this message]
2023-06-07 14:05 ` [PATCH v8 05/10] dt-bindings: sc16is7xx: Add property to change GPIO function Hugo Villeneuve
2023-06-07 14:30 ` Krzysztof Kozlowski
2023-06-07 14:41 ` Hugo Villeneuve
2023-06-07 14:46 ` Krzysztof Kozlowski
2023-06-07 14:52 ` Hugo Villeneuve
2023-06-07 14:57 ` Krzysztof Kozlowski
2023-06-07 15:09 ` Hugo Villeneuve
2023-06-07 14:05 ` [PATCH v8 06/10] serial: sc16is7xx: fix regression with GPIO configuration Hugo Villeneuve
2023-06-07 14:05 ` [PATCH v8 07/10] serial: sc16is7xx: fix bug when first setting GPIO direction Hugo Villeneuve
2023-06-07 14:05 ` [PATCH v8 08/10] serial: sc16is7xx: add call to get rs485 DT flags and properties Hugo Villeneuve
2023-06-07 14:05 ` [PATCH v8 09/10] serial: sc16is7xx: add post reset delay Hugo Villeneuve
2023-06-07 14:05 ` [PATCH v8 10/10] serial: sc16is7xx: improve comments about variants Hugo Villeneuve
2023-06-12 12:10 ` [PATCH v8 00/10] serial: sc16is7xx: fix GPIO regression and rs485 improvements Lech Perczak
2023-06-12 13:40 ` Hugo Villeneuve
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=20230607140525.833982-5-hugo@hugovil.com \
--to=hugo@hugovil.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hvilleneuve@dimonoff.com \
--cc=isaac.true@canonical.com \
--cc=jesse.sung@canonical.com \
--cc=jirislaby@kernel.org \
--cc=jringle@gridpoint.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=l.perczak@camlintechnologies.com \
--cc=lech.perczak@camlingroup.com \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tomasz.mon@camlingroup.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).