From: andre.przywara@arm.com (Andre Przywara)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 09/10] drivers: PL011: allow to supply fixed option string
Date: Wed, 4 Mar 2015 17:59:53 +0000 [thread overview]
Message-ID: <1425491994-23913-10-git-send-email-andre.przywara@arm.com> (raw)
In-Reply-To: <1425491994-23913-1-git-send-email-andre.przywara@arm.com>
The SBSA UART has a fixed baud rate and flow control setting, which
cannot be changed or queried by software.
Add a vendor specific property to always return fixed values when
trying to read the console options.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
drivers/tty/serial/amba-pl011.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index fdb9fa5..d3b034f 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -80,6 +80,7 @@ struct vendor_data {
bool dma_threshold;
bool cts_event_workaround;
bool always_enabled;
+ bool fixed_options;
unsigned int (*get_fifosize)(struct amba_device *dev);
};
@@ -97,6 +98,7 @@ static struct vendor_data vendor_arm = {
.dma_threshold = false,
.cts_event_workaround = false,
.always_enabled = false,
+ .fixed_options = false,
.get_fifosize = get_fifosize_arm,
};
@@ -113,6 +115,7 @@ static struct vendor_data vendor_st = {
.dma_threshold = true,
.cts_event_workaround = true,
.always_enabled = false,
+ .fixed_options = false,
.get_fifosize = get_fifosize_st,
};
@@ -163,6 +166,7 @@ struct uart_amba_port {
struct delayed_work tx_softirq_work;
bool autorts;
unsigned int tx_irq_seen; /* 0=none, 1=1, 2=2 or more */
+ unsigned int fixed_baud; /* vendor-set fixed baud rate */
char type[12];
#ifdef CONFIG_DMA_ENGINE
/* DMA stuff */
@@ -2177,10 +2181,15 @@ static int __init pl011_console_setup(struct console *co, char *options)
uap->port.uartclk = clk_get_rate(uap->clk);
- if (options)
- uart_parse_options(options, &baud, &parity, &bits, &flow);
- else
- pl011_console_get_options(uap, &baud, &parity, &bits);
+ if (uap->vendor->fixed_options) {
+ baud = uap->fixed_baud;
+ } else {
+ if (options)
+ uart_parse_options(options,
+ &baud, &parity, &bits, &flow);
+ else
+ pl011_console_get_options(uap, &baud, &parity, &bits);
+ }
return uart_set_options(&uap->port, co, baud, parity, bits, flow);
}
--
1.7.9.5
next prev parent reply other threads:[~2015-03-04 17:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-04 17:59 [PATCH v2 00/10] drivers: PL011: add ARM SBSA Generic UART support Andre Przywara
2015-03-04 17:59 ` [PATCH v2 01/10] drivers: PL011: avoid potential unregister_driver call Andre Przywara
2015-03-12 10:42 ` Russell King - ARM Linux
2015-04-08 15:39 ` Andre Przywara
2015-04-08 18:14 ` Russell King - ARM Linux
2015-03-04 17:59 ` [PATCH v2 02/10] drivers: PL011: refactor pl011_startup() Andre Przywara
2015-03-04 17:59 ` [PATCH v2 03/10] drivers: PL011: refactor pl011_shutdown() Andre Przywara
2015-03-04 17:59 ` [PATCH v2 04/10] drivers: PL011: refactor pl011_set_termios() Andre Przywara
2015-03-04 17:59 ` [PATCH v2 05/10] drivers: PL011: refactor pl011_probe() Andre Przywara
2015-03-04 17:59 ` [PATCH v2 06/10] drivers: PL011: replace UART_MIS reading with _RIS & _IMSC Andre Przywara
2015-03-12 10:46 ` Russell King - ARM Linux
2015-03-04 17:59 ` [PATCH v2 07/10] drivers: PL011: move cts_event workaround into separate function Andre Przywara
2015-03-07 3:00 ` Greg KH
2015-03-04 17:59 ` [PATCH v2 08/10] drivers: PL011: allow avoiding UART enabling/disabling Andre Przywara
2015-03-04 17:59 ` Andre Przywara [this message]
2015-03-04 17:59 ` [PATCH v2 10/10] drivers: PL011: add support for the ARM SBSA generic UART Andre Przywara
2015-03-09 15:59 ` Dave Martin
2015-03-12 10:52 ` Russell King - ARM Linux
2015-03-12 13:43 ` Andre Przywara
2015-03-12 13:49 ` Russell King - ARM Linux
2015-03-12 13:58 ` Andre Przywara
2015-03-07 3:01 ` [PATCH v2 00/10] drivers: PL011: add ARM SBSA Generic UART support Greg KH
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=1425491994-23913-10-git-send-email-andre.przywara@arm.com \
--to=andre.przywara@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).