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>,
andrew.jackson@arm.com, jslaby@suse.com, jun.nie@linaro.org,
shijie.huang@arm.com, linux-serial@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, peter@hurleysoftware.com
Subject: [PATCH 1/2] tty: amba-pl011: fix earlycon register offsets
Date: Thu, 24 Dec 2015 09:49:48 -0600 [thread overview]
Message-ID: <1450972189-22639-1-git-send-email-timur@codeaurora.org> (raw)
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: 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..06f827a 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) & UART011_FR_BUSY)
;
}
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
WARNING: multiple messages have this Message-ID (diff)
From: timur@codeaurora.org (Timur Tabi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] tty: amba-pl011: fix earlycon register offsets
Date: Thu, 24 Dec 2015 09:49:48 -0600 [thread overview]
Message-ID: <1450972189-22639-1-git-send-email-timur@codeaurora.org> (raw)
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: 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..06f827a 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) & UART011_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:[~2015-12-24 15:49 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-24 15:49 Timur Tabi [this message]
2015-12-24 15:49 ` [PATCH 1/2] tty: amba-pl011: fix earlycon register offsets Timur Tabi
2015-12-24 15:49 ` [PATCH 2/2] tty: amba-pl011: use iotype instead of access_32b to track 32-bit I/O Timur Tabi
2015-12-24 15:49 ` Timur Tabi
2015-12-24 16:47 ` [PATCH 1/2] tty: amba-pl011: fix earlycon register offsets Russell King - ARM Linux
2015-12-24 16:47 ` Russell King - ARM Linux
2016-01-05 12:12 ` Sudeep Holla
2016-01-05 12:12 ` Sudeep Holla
2016-01-05 12:30 ` Russell King - ARM Linux
2016-01-05 12:30 ` Russell King - ARM Linux
2016-01-05 13:45 ` Sudeep Holla
2016-01-05 13:45 ` Sudeep Holla
2016-01-06 2:43 ` Greg Kroah-Hartman
2016-01-06 2:43 ` Greg Kroah-Hartman
2016-01-06 10:07 ` Russell King - ARM Linux
2016-01-06 10:07 ` Russell King - ARM Linux
2016-01-07 5:17 ` Greg Kroah-Hartman
2016-01-07 5:17 ` Greg Kroah-Hartman
2016-01-07 18:13 ` Peter Hurley
2016-01-07 18:13 ` Peter Hurley
2015-12-25 1:46 ` Huang Shijie
2015-12-25 1:46 ` Huang Shijie
2015-12-25 1:56 ` Huang Shijie
2015-12-25 1:56 ` Huang Shijie
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=1450972189-22639-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-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.