From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Geert Uytterhoeven <geert+renesas@glider.be>,
Magnus Damm <magnus.damm@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jirislaby@kernel.org>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-renesas-soc@vger.kernel.org, linux-serial@vger.kernel.org,
Milan Stevanovic <milan.stevanovic@se.com>,
Jimmy Lalande <jimmy.lalande@se.com>,
Pascal Eberhard <pascal.eberhard@se.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Herve Codina <herve.codina@bootlin.com>,
Clement Leger <clement.leger@bootlin.com>,
Ilpo Jarvinen <ilpo.jarvinen@linux.intel.com>,
Emil Renner Berthing <kernel@esmil.dk>
Subject: [PATCH v6 02/12] serial: 8250: dw: Create a generic platform data structure
Date: Thu, 21 Apr 2022 11:53:13 +0200 [thread overview]
Message-ID: <20220421095323.101811-3-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20220421095323.101811-1-miquel.raynal@bootlin.com>
From: Emil Renner Berthing <kernel@esmil.dk>
Use device tree match data rather than multiple calls to
of_device_is_compatible() by introducing a platform data structure and
adding a quirks mask.
Provide a stub to the compatibles without quirks to simplify the
handling of the upcoming changes.
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
[<miquel.raynal@bootlin.com: Minor changes + creation of a real pdata structure]
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/tty/serial/8250/8250_dw.c | 42 ++++++++++++++++++++++------
drivers/tty/serial/8250/8250_dwlib.h | 5 ++++
2 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index dcbe54ccd16b..7fdb2683f534 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -19,6 +19,7 @@
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/platform_device.h>
+#include <linux/property.h>
#include <linux/workqueue.h>
#include <linux/notifier.h>
#include <linux/slab.h>
@@ -37,6 +38,11 @@
/* DesignWare specific register fields */
#define DW_UART_MCR_SIRE BIT(6)
+/* Quirks */
+#define DW_UART_QUIRK_OCTEON BIT(0)
+#define DW_UART_QUIRK_ARMADA_38X BIT(1)
+#define DW_UART_QUIRK_SKIP_SET_RATE BIT(2)
+
static inline struct dw8250_data *clk_to_dw8250_data(struct notifier_block *nb)
{
return container_of(nb, struct dw8250_data, clk_notifier);
@@ -366,6 +372,7 @@ static bool dw8250_idma_filter(struct dma_chan *chan, void *param)
static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data)
{
struct device_node *np = p->dev->of_node;
+ unsigned int quirks = data->pdata->quirks;
if (np) {
int id;
@@ -375,7 +382,7 @@ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data)
if (id >= 0)
p->line = id;
#ifdef CONFIG_64BIT
- if (of_device_is_compatible(np, "cavium,octeon-3860-uart")) {
+ if (quirks & DW_UART_QUIRK_OCTEON) {
p->serial_in = dw8250_serial_inq;
p->serial_out = dw8250_serial_outq;
p->flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_FIXED_TYPE;
@@ -391,9 +398,9 @@ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data)
p->serial_out = dw8250_serial_out32be;
}
- if (of_device_is_compatible(np, "marvell,armada-38x-uart"))
+ if (quirks & DW_UART_QUIRK_ARMADA_38X)
p->serial_out = dw8250_serial_out38x;
- if (of_device_is_compatible(np, "starfive,jh7100-uart"))
+ if (quirks & DW_UART_QUIRK_SKIP_SET_RATE)
p->set_termios = dw8250_do_set_termios;
} else if (acpi_dev_present("APMC0D08", NULL, -1)) {
@@ -456,6 +463,7 @@ static int dw8250_probe(struct platform_device *pdev)
data->data.dma.fn = dw8250_fallback_dma_filter;
data->usr_reg = DW_UART_USR;
+ data->pdata = device_get_match_data(p->dev);
p->private_data = &data->data;
data->uart_16550_compatible = device_property_read_bool(dev,
@@ -672,12 +680,30 @@ static const struct dev_pm_ops dw8250_pm_ops = {
SET_RUNTIME_PM_OPS(dw8250_runtime_suspend, dw8250_runtime_resume, NULL)
};
+static const struct dw8250_platform_data dw8250_dw_apb = {
+};
+
+static const struct dw8250_platform_data dw8250_octeon_3860_data = {
+ .quirks = DW_UART_QUIRK_OCTEON,
+};
+
+static const struct dw8250_platform_data dw8250_armada_38x_data = {
+ .quirks = DW_UART_QUIRK_ARMADA_38X,
+};
+
+static const struct dw8250_platform_data dw8250_renesas_rzn1_data = {
+};
+
+static const struct dw8250_platform_data dw8250_starfive_jh7100_data = {
+ .quirks = DW_UART_QUIRK_SKIP_SET_RATE,
+};
+
static const struct of_device_id dw8250_of_match[] = {
- { .compatible = "snps,dw-apb-uart" },
- { .compatible = "cavium,octeon-3860-uart" },
- { .compatible = "marvell,armada-38x-uart" },
- { .compatible = "renesas,rzn1-uart" },
- { .compatible = "starfive,jh7100-uart" },
+ { .compatible = "snps,dw-apb-uart", .data = &dw8250_dw_apb },
+ { .compatible = "cavium,octeon-3860-uart", .data = &dw8250_octeon_3860_data },
+ { .compatible = "marvell,armada-38x-uart", .data = &dw8250_armada_38x_data },
+ { .compatible = "renesas,rzn1-uart", .data = &dw8250_renesas_rzn1_data },
+ { .compatible = "starfive,jh7100-uart", .data = &dw8250_starfive_jh7100_data },
{ /* Sentinel */ }
};
MODULE_DEVICE_TABLE(of, dw8250_of_match);
diff --git a/drivers/tty/serial/8250/8250_dwlib.h b/drivers/tty/serial/8250/8250_dwlib.h
index 72e7dbcccad0..68bb81bee660 100644
--- a/drivers/tty/serial/8250/8250_dwlib.h
+++ b/drivers/tty/serial/8250/8250_dwlib.h
@@ -21,8 +21,13 @@ struct dw8250_port_data {
u8 dlf_size;
};
+struct dw8250_platform_data {
+ unsigned int quirks;
+};
+
struct dw8250_data {
struct dw8250_port_data data;
+ const struct dw8250_platform_data *pdata;
u8 usr_reg;
int msr_mask_on;
--
2.27.0
next prev parent reply other threads:[~2022-04-21 9:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-21 9:53 [PATCH v6 00/12] serial: 8250: dw: RZN1 DMA support Miquel Raynal
2022-04-21 9:53 ` [PATCH v6 01/12] serial: 8250: dw: Move definitions to the shared header Miquel Raynal
2022-04-21 9:53 ` Miquel Raynal [this message]
2022-04-21 9:53 ` [PATCH v6 03/12] serial: 8250: dw: Move the USR register to pdata Miquel Raynal
2022-04-21 9:53 ` [PATCH v6 04/12] serial: 8250: dw: Allow to use a fallback CPR value if not synthesized Miquel Raynal
2022-04-21 9:53 ` [PATCH v6 05/12] serial: 8250: dma: Allow driver operations before starting DMA transfers Miquel Raynal
2022-04-21 9:53 ` [PATCH v6 06/12] serial: 8250: dw: Introduce an rx_timeout variable in the IRQ path Miquel Raynal
2022-04-21 9:53 ` [PATCH v6 07/12] serial: 8250: dw: Move the IO accessors to 8250_dwlib.h Miquel Raynal
2022-04-21 9:53 ` [PATCH v6 08/12] serial: 8250: dw: Add support for DMA flow controlling devices Miquel Raynal
2022-04-21 9:53 ` [PATCH v6 09/12] serial: 8250: dw: Improve RZN1 support Miquel Raynal
2022-04-21 9:53 ` [PATCH v6 10/12] ARM: dts: r9a06g032: Fill the UART DMA properties Miquel Raynal
2022-04-28 9:09 ` Geert Uytterhoeven
2022-05-03 8:36 ` Geert Uytterhoeven
2022-04-21 9:53 ` [PATCH v6 11/12] bestla: Enable DMA, UART3 and UART4 Miquel Raynal
2022-04-21 10:21 ` Miquel Raynal
2022-04-22 14:04 ` Greg Kroah-Hartman
2022-04-22 14:26 ` Geert Uytterhoeven
2022-04-22 15:52 ` Miquel Raynal
2022-04-21 9:53 ` [PATCH v6 12/12] bestla: Add support for RZN1 dmamux Miquel Raynal
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=20220421095323.101811-3-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=clement.leger@bootlin.com \
--cc=geert+renesas@glider.be \
--cc=gregkh@linuxfoundation.org \
--cc=herve.codina@bootlin.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=jimmy.lalande@se.com \
--cc=jirislaby@kernel.org \
--cc=kernel@esmil.dk \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=milan.stevanovic@se.com \
--cc=pascal.eberhard@se.com \
--cc=thomas.petazzoni@bootlin.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.