From: Antony Pavlov <antonynpavlov@gmail.com>
To: barebox@lists.infradead.org
Subject: [PATCH v3 3/8] serial: ns16550: make FCR setup value part of struct ns16550_priv
Date: Tue, 25 Mar 2014 20:50:54 +0400 [thread overview]
Message-ID: <1395766259-31866-4-git-send-email-antonynpavlov@gmail.com> (raw)
In-Reply-To: <1395766259-31866-1-git-send-email-antonynpavlov@gmail.com>
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
drivers/serial/serial_ns16550.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index d217014..7bd426d 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -48,6 +48,7 @@ struct ns16550_priv {
struct NS16550_plat plat;
int access_width;
struct clk *clk;
+ uint32_t fcrval;
};
static inline struct ns16550_priv *to_ns16550_priv(struct console_device *cdev)
@@ -157,18 +158,13 @@ static int ns16550_setbaudrate(struct console_device *cdev, int baud_rate)
{
unsigned int baud_divisor = ns16550_calc_divisor(cdev, baud_rate);
struct ns16550_priv *priv = to_ns16550_priv(cdev);
- struct NS16550_plat *plat = &priv->plat;
ns16550_write(cdev, LCR_BKSE, lcr);
ns16550_write(cdev, baud_divisor & 0xff, dll);
ns16550_write(cdev, (baud_divisor >> 8) & 0xff, dlm);
ns16550_write(cdev, LCRVAL, lcr);
ns16550_write(cdev, MCRVAL, mcr);
-
- if (plat->flags & NS16650_FLAG_DISABLE_FIFO)
- ns16550_write(cdev, FCRVAL & ~FCR_FIFO_EN, fcr);
- else
- ns16550_write(cdev, FCRVAL, fcr);
+ ns16550_write(cdev, priv->fcrval, fcr);
return 0;
}
@@ -316,6 +312,11 @@ static int ns16550_probe(struct device_d *dev)
cdev->setbrg = ns16550_setbaudrate;
cdev->linux_console_name = devtype->linux_console_name;
+ if (plat && (plat->flags & NS16650_FLAG_DISABLE_FIFO))
+ priv->fcrval = FCRVAL & ~FCR_FIFO_EN;
+ else
+ priv->fcrval = FCRVAL;
+
devtype->init_port(cdev);
return console_register(cdev);
--
1.9.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-03-25 16:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-25 16:50 [PATCH v3 0/8] MIPS: improve Ingenic JZ4755 device tree support Antony Pavlov
2014-03-25 16:50 ` [PATCH v3 1/8] MIPS: dts: rzx50: move jz4755 description to the separate file Antony Pavlov
2014-03-25 16:50 ` [PATCH v3 2/8] serial: ns16550: fix whitespaces Antony Pavlov
2014-03-25 16:50 ` Antony Pavlov [this message]
2014-03-25 16:50 ` [PATCH v3 4/8] serial: ns16550: add compatible entry for "ns16450" Antony Pavlov
2014-03-25 16:50 ` [PATCH v3 5/8] serial: ns16550: add compatible entry for "ingenic, jz4740-uart" Antony Pavlov
2014-03-25 16:50 ` [PATCH v3 6/8] MIPS: rzx50: drop console initialization in board code Antony Pavlov
2014-03-25 16:50 ` [PATCH v3 7/8] MIPS: mach-xburst: drop serial.c Antony Pavlov
2014-03-25 16:50 ` [PATCH v3 8/8] MIPS: boards: rename rzx50 -> ritmix-rzx50 Antony Pavlov
2014-03-26 8:03 ` [PATCH v3 0/8] MIPS: improve Ingenic JZ4755 device tree support Sascha Hauer
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=1395766259-31866-4-git-send-email-antonynpavlov@gmail.com \
--to=antonynpavlov@gmail.com \
--cc=barebox@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