From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-aspeed@lists.ozlabs.org,
linux-rpi-kernel@lists.infradead.org, linux-mips@vger.kernel.org,
linux-tegra@vger.kernel.org
Cc: "Jiri Slaby" <jirislaby@kernel.org>,
"Joel Stanley" <joel@jms.id.au>,
"Andrew Jeffery" <andrew@codeconstruct.com.au>,
"Florian Fainelli" <florian.fainelli@broadcom.com>,
"Ray Jui" <rjui@broadcom.com>,
"Scott Branden" <sbranden@broadcom.com>,
"Broadcom internal kernel review list"
<bcm-kernel-feedback-list@broadcom.com>,
"Al Cooper" <alcooperx@gmail.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Paul Cercueil" <paul@crapouillou.net>,
"Vladimir Zapolskiy" <vz@mleia.com>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Jonathan Hunter" <jonathanh@nvidia.com>,
"Kunihiko Hayashi" <hayashi.kunihiko@socionext.com>,
"Masami Hiramatsu" <mhiramat@kernel.org>
Subject: [PATCH v1 11/14] serial: 8250_omap: Switch to use uart_read_port_properties()
Date: Wed, 21 Feb 2024 20:31:27 +0200 [thread overview]
Message-ID: <20240221183442.4124354-12-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20240221183442.4124354-1-andriy.shevchenko@linux.intel.com>
Since we have now a common helper to read port properties
use it instead of sparse home grown solution.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/tty/serial/8250/8250_omap.c | 29 ++++++++++-------------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c
index 6942990a333c..173af575a43e 100644
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -1394,11 +1394,7 @@ static int omap8250_probe(struct platform_device *pdev)
struct uart_8250_port up;
struct resource *regs;
void __iomem *membase;
- int irq, ret;
-
- irq = platform_get_irq(pdev, 0);
- if (irq < 0)
- return irq;
+ int ret;
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!regs) {
@@ -1419,7 +1415,6 @@ static int omap8250_probe(struct platform_device *pdev)
up.port.dev = &pdev->dev;
up.port.mapbase = regs->start;
up.port.membase = membase;
- up.port.irq = irq;
/*
* It claims to be 16C750 compatible however it is a little different.
* It has EFR and has no FCR7_64byte bit. The AFE (which it claims to
@@ -1429,13 +1424,9 @@ static int omap8250_probe(struct platform_device *pdev)
* or pm callback.
*/
up.port.type = PORT_8250;
- up.port.iotype = UPIO_MEM;
- up.port.flags = UPF_FIXED_PORT | UPF_FIXED_TYPE | UPF_SOFT_FLOW |
- UPF_HARD_FLOW;
+ up.port.flags = UPF_FIXED_PORT | UPF_FIXED_TYPE | UPF_SOFT_FLOW | UPF_HARD_FLOW;
up.port.private_data = priv;
- up.port.regshift = OMAP_UART_REGSHIFT;
- up.port.fifosize = 64;
up.tx_loadsz = 64;
up.capabilities = UART_CAP_FIFO;
#ifdef CONFIG_PM
@@ -1461,14 +1452,14 @@ static int omap8250_probe(struct platform_device *pdev)
up.rs485_stop_tx = serial8250_em485_stop_tx;
up.port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_8250_CONSOLE);
- ret = of_alias_get_id(np, "serial");
- if (ret < 0) {
- dev_err(&pdev->dev, "failed to get alias\n");
+ ret = uart_read_port_properties(&up.port, true);
+ if (ret)
return ret;
- }
- up.port.line = ret;
- if (of_property_read_u32(np, "clock-frequency", &up.port.uartclk)) {
+ up.port.regshift = OMAP_UART_REGSHIFT;
+ up.port.fifosize = 64;
+
+ if (!up.port.uartclk) {
struct clk *clk;
clk = devm_clk_get(&pdev->dev, NULL);
@@ -1560,8 +1551,8 @@ static int omap8250_probe(struct platform_device *pdev)
}
#endif
- irq_set_status_flags(irq, IRQ_NOAUTOEN);
- ret = devm_request_irq(&pdev->dev, irq, omap8250_irq, 0,
+ irq_set_status_flags(up.port.irq, IRQ_NOAUTOEN);
+ ret = devm_request_irq(&pdev->dev, up.port.irq, omap8250_irq, 0,
dev_name(&pdev->dev), priv);
if (ret < 0)
return ret;
--
2.43.0.rc1.1.gbec44491f096
next prev parent reply other threads:[~2024-02-21 18:35 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-21 18:31 [rft, PATCH v1 00/14] serial: Add a helper to parse device properties and more Andy Shevchenko
2024-02-21 18:31 ` [PATCH v1 01/14] serial: core: Move struct uart_port::quirks closer to possible values Andy Shevchenko
2024-02-21 18:54 ` Hugo Villeneuve
2024-02-21 19:04 ` Andy Shevchenko
2024-02-21 18:31 ` [PATCH v1 02/14] serial: core: Add UPIO_UNSET constant for unset port type Andy Shevchenko
2024-02-21 18:47 ` Florian Fainelli
2024-02-21 18:53 ` Andy Shevchenko
2024-02-22 6:58 ` Jiri Slaby
2024-02-22 13:21 ` Andy Shevchenko
2024-02-23 5:42 ` Jiri Slaby
2024-02-23 14:59 ` Andy Shevchenko
2024-02-26 14:17 ` Andy Shevchenko
2024-02-21 18:31 ` [PATCH v1 03/14] serial: port: Introduce a common helper to read properties Andy Shevchenko
2024-02-21 18:31 ` [PATCH v1 04/14] serial: 8250_aspeed_vuart: Switch to use uart_read_port_properties() Andy Shevchenko
2024-02-26 4:13 ` Andrew Jeffery
2024-02-21 18:31 ` [PATCH v1 05/14] serial: 8250_bcm2835aux: " Andy Shevchenko
2024-02-21 18:31 ` [PATCH v1 06/14] serial: 8250_bcm7271: " Andy Shevchenko
2024-02-23 4:14 ` kernel test robot
2024-02-23 15:01 ` Andy Shevchenko
2024-02-21 18:31 ` [PATCH v1 07/14] serial: 8250_dw: " Andy Shevchenko
2024-02-21 18:31 ` [PATCH v1 08/14] serial: 8250_ingenic: " Andy Shevchenko
2024-02-21 18:31 ` [PATCH v1 09/14] serial: 8250_lpc18xx: " Andy Shevchenko
2024-02-21 18:31 ` [PATCH v1 10/14] serial: 8250_of: " Andy Shevchenko
2024-02-22 0:37 ` Andrew Jeffery
2024-02-22 13:23 ` Andy Shevchenko
2024-02-22 16:43 ` Andy Shevchenko
2024-02-22 16:47 ` Andy Shevchenko
2024-02-22 17:39 ` Florian Fainelli
2024-02-22 19:54 ` Florian Fainelli
2024-02-23 15:02 ` Andy Shevchenko
2024-02-26 4:12 ` Andrew Jeffery
2024-02-21 18:31 ` Andy Shevchenko [this message]
2024-02-21 18:31 ` [PATCH v1 12/14] serial: 8250_pxa: " Andy Shevchenko
2024-02-21 18:31 ` [PATCH v1 13/14] serial: 8250_tegra: " Andy Shevchenko
2024-02-21 18:31 ` [PATCH v1 14/14] serial: 8250_uniphier: " Andy Shevchenko
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=20240221183442.4124354-12-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=alcooperx@gmail.com \
--cc=andrew@codeconstruct.com.au \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=florian.fainelli@broadcom.com \
--cc=gregkh@linuxfoundation.org \
--cc=hayashi.kunihiko@socionext.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=jirislaby@kernel.org \
--cc=joel@jms.id.au \
--cc=jonathanh@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=paul@crapouillou.net \
--cc=rjui@broadcom.com \
--cc=sbranden@broadcom.com \
--cc=tglx@linutronix.de \
--cc=thierry.reding@gmail.com \
--cc=vz@mleia.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 read-only IMAP folder(s) and NNTP newsgroup(s).