From: Antony Pavlov <antonynpavlov@gmail.com>
To: barebox@lists.infradead.org
Subject: [PATCH v4 2/4] ns16550: make ns16550_serial_init_port() shorter
Date: Wed, 18 Jan 2012 10:31:54 +0400 [thread overview]
Message-ID: <1326868316-29385-3-git-send-email-antonynpavlov@gmail.com> (raw)
In-Reply-To: <1326868316-29385-1-git-send-email-antonynpavlov@gmail.com>
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
drivers/serial/serial_ns16550.c | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 4cef469..3382acd 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -47,6 +47,7 @@
#include <ns16550.h>
/*********** Private Functions **********************************/
+static int ns16550_setbaudrate(struct console_device *cdev, int baud_rate);
/**
* @brief read register
@@ -120,7 +121,7 @@ static void ns16550_write(struct console_device *cdev, uint32_t val,
*
* @return divisor to be set
*/
-static unsigned int ns16550_calc_divisor(struct console_device *cdev,
+static inline unsigned int ns16550_calc_divisor(struct console_device *cdev,
unsigned int baudrate)
{
struct NS16550_plat *plat = (struct NS16550_plat *)
@@ -138,28 +139,13 @@ static unsigned int ns16550_calc_divisor(struct console_device *cdev,
*/
static void ns16550_serial_init_port(struct console_device *cdev)
{
- unsigned int baud_divisor;
- struct NS16550_plat *plat = (struct NS16550_plat *)
- cdev->dev->platform_data;
-
- /* Setup the serial port with the defaults first */
- baud_divisor = ns16550_calc_divisor(cdev, CONFIG_BAUDRATE);
-
/* initializing the device for the first time */
ns16550_write(cdev, 0x00, ier);
#ifdef CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS
ns16550_write(cdev, 0x07, mdr1); /* Disable */
#endif
- ns16550_write(cdev, LCR_BKSE | LCRVAL, 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_setbaudrate(cdev, CONFIG_BAUDRATE);
#ifdef CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS
ns16550_write(cdev, 0x00, mdr1);
--
1.7.8.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-01-18 6:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-18 6:31 [PATCH v4 0/2] ns16550-related patches Antony Pavlov
2012-01-18 6:31 ` [PATCH v4 1/4] ns16550: support for UART with broken FIFO Antony Pavlov
2012-01-18 6:31 ` Antony Pavlov [this message]
2012-01-18 6:31 ` [PATCH v4 3/4] ns16550: write zero to ier only once Antony Pavlov
2012-01-18 6:31 ` [PATCH v4 4/4] ns16550: fix ier selection Antony Pavlov
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=1326868316-29385-3-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