From: Timur Tabi <timur@codeaurora.org>
To: Greg Kroah-Hartman <greg@kroah.com>,
Russell King <rmk+kernel@arm.linux.org.uk>,
andre.przywara@arm.com, Linus Walleij <linus.walleij@linaro.org>,
jslaby@suse.com, jun.nie@linaro.org, shijie.huang@arm.com,
peter@hurleysoftware.com, andrew.jackson@arm.com,
linux-serial@vger.kernel.org, linux-arm-msm@vger.kernel.org
Subject: [PATCH 1/2] [v2] tty: amba-pl011: fix earlycon register offsets
Date: Mon, 4 Jan 2016 15:37:41 -0600 [thread overview]
Message-ID: <1451943462-27818-1-git-send-email-timur@codeaurora.org> (raw)
From: Russell King <rmk+kernel@arm.linux.org.uk>
The REG_x macros are indices into a table, not register offsets. Since earlycon
does not have access to the vendor data, we can currently only support standard
ARM PL011 devices.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-by: Huang Shijie <shijie.huang@arm.com>
Signed-off-by: Timur Tabi <timur@codeaurora.org>
---
drivers/tty/serial/amba-pl011.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index f6ad383..42aabb84 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2302,10 +2302,10 @@ static struct console amba_console = {
static void pl011_putc(struct uart_port *port, int c)
{
- while (readl(port->membase + REG_FR) & UART01x_FR_TXFF)
+ while (readl(port->membase + UART01x_FR) & UART01x_FR_TXFF)
;
- writeb(c, port->membase + REG_DR);
- while (readl(port->membase + REG_FR) & UART01x_FR_BUSY)
+ writeb(c, port->membase + UART01x_DR);
+ while (readl(port->membase + UART01x_FR) & UART01x_FR_BUSY)
;
}
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
next reply other threads:[~2016-01-04 21:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-04 21:37 Timur Tabi [this message]
2016-01-04 21:37 ` [PATCH 2/2] tty: amba-pl011: use iotype instead of access_32b to track 32-bit I/O Timur Tabi
2016-01-07 8:09 ` Geert Uytterhoeven
2016-01-06 2:43 ` [PATCH 1/2] [v2] tty: amba-pl011: fix earlycon register offsets Greg Kroah-Hartman
2016-01-06 2:46 ` Timur Tabi
2016-01-06 2:51 ` Greg Kroah-Hartman
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=1451943462-27818-1-git-send-email-timur@codeaurora.org \
--to=timur@codeaurora.org \
--cc=andre.przywara@arm.com \
--cc=andrew.jackson@arm.com \
--cc=greg@kroah.com \
--cc=jslaby@suse.com \
--cc=jun.nie@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=peter@hurleysoftware.com \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=shijie.huang@arm.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 NNTP newsgroup(s).