From: Kevin Cernekee <cernekee@gmail.com>
To: gregkh@linuxfoundation.org, jslaby@suse.cz, robh@kernel.org
Cc: arnd@arndb.de, daniel@zonque.org, haojian.zhuang@gmail.com,
robert.jarzmik@free.fr, grant.likely@linaro.org,
f.fainelli@gmail.com, mbizon@freebox.fr, jogo@openwrt.org,
linux-mips@linux-mips.org, linux-serial@vger.kernel.org,
devicetree@vger.kernel.org
Subject: [PATCH V2 09/10] serial: earlycon: Set UPIO_MEM32BE based on DT properties
Date: Wed, 12 Nov 2014 12:54:06 -0800 [thread overview]
Message-ID: <1415825647-6024-10-git-send-email-cernekee@gmail.com> (raw)
In-Reply-To: <1415825647-6024-1-git-send-email-cernekee@gmail.com>
If an earlycon (stdout-path) node is being used, check for "big-endian"
or "native-endian" properties and pass the appropriate iotype to the
driver.
Note that LE sets UPIO_MEM (8-bit) but BE sets UPIO_MEM32BE (32-bit). The
big-endian property only really makes sense in the context of 32-bit
registers, since 8-bit accesses never require data swapping.
At some point, the of_earlycon code may want to pass in the reg-io-width,
reg-offset, and reg-shift parameters too.
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
---
drivers/of/fdt.c | 9 ++++++++-
drivers/tty/serial/earlycon.c | 4 ++--
include/linux/serial_core.h | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 30e97bc..15f80c9 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -10,6 +10,7 @@
*/
#include <linux/kernel.h>
+#include <linux/kconfig.h>
#include <linux/initrd.h>
#include <linux/memblock.h>
#include <linux/of.h>
@@ -784,7 +785,13 @@ int __init early_init_dt_scan_chosen_serial(void)
if (!addr)
return -ENXIO;
- of_setup_earlycon(addr, match->data);
+ if (fdt_getprop(fdt, offset, "big-endian", NULL) ||
+ (fdt_getprop(fdt, offset, "native-endian", NULL) &&
+ IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))) {
+ of_setup_earlycon(addr, UPIO_MEM32BE, match->data);
+ } else {
+ of_setup_earlycon(addr, UPIO_MEM, match->data);
+ }
return 0;
}
return -ENODEV;
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index a514ee6..548f7d7 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -148,13 +148,13 @@ int __init setup_earlycon(char *buf, const char *match,
return 0;
}
-int __init of_setup_earlycon(unsigned long addr,
+int __init of_setup_earlycon(unsigned long addr, unsigned char iotype,
int (*setup)(struct earlycon_device *, const char *))
{
int err;
struct uart_port *port = &early_console_dev.port;
- port->iotype = UPIO_MEM;
+ port->iotype = iotype;
port->mapbase = addr;
port->uartclk = BASE_BAUD * 16;
port->membase = earlycon_map(addr, SZ_4K);
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index d2d5bf6..0d60c64 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -310,7 +310,7 @@ struct earlycon_device {
int setup_earlycon(char *buf, const char *match,
int (*setup)(struct earlycon_device *, const char *));
-extern int of_setup_earlycon(unsigned long addr,
+extern int of_setup_earlycon(unsigned long addr, unsigned char iotype,
int (*setup)(struct earlycon_device *, const char *));
#define EARLYCON_DECLARE(name, func) \
--
2.1.1
next prev parent reply other threads:[~2014-11-12 20:54 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-12 20:53 [PATCH V2 00/10] UART driver support for BMIPS multiplatform kernels Kevin Cernekee
2014-11-12 20:53 ` [PATCH V2 01/10] tty: Fallback to use dynamic major number Kevin Cernekee
2014-11-25 20:34 ` Greg KH
2014-11-25 23:37 ` Kevin Cernekee
2014-11-25 23:49 ` Greg KH
2014-11-26 13:33 ` Grant Likely
2014-11-26 14:34 ` Peter Hurley
2014-11-27 11:10 ` Geert Uytterhoeven
2014-11-27 13:50 ` Grant Likely
2014-11-27 14:33 ` Arnd Bergmann
2014-11-12 20:53 ` [PATCH V2 02/10] serial: core: Add big-endian iotype Kevin Cernekee
2014-11-12 20:54 ` [PATCH V2 03/10] of: Fix of_device_is_compatible() comment Kevin Cernekee
2014-11-18 17:32 ` Grant Likely
2014-11-12 20:54 ` [PATCH V2 04/10] of: Change of_device_is_available() to return bool Kevin Cernekee
2014-11-18 17:33 ` Grant Likely
2014-11-12 20:54 ` [PATCH V2 05/10] of: Add helper function to check MMIO register endianness Kevin Cernekee
2014-11-18 21:47 ` Grant Likely
2014-11-12 20:54 ` [PATCH V2 06/10] serial: pxa: Add fifo-size and {big,native}-endian properties Kevin Cernekee
2014-11-19 14:49 ` Grant Likely
2014-11-19 16:23 ` Kevin Cernekee
2014-11-12 20:54 ` [PATCH V2 07/10] serial: pxa: Make the driver buildable for BCM7xxx set-top platforms Kevin Cernekee
2014-11-12 20:54 ` [PATCH V2 08/10] serial: pxa: Update DT binding documentation Kevin Cernekee
2014-11-12 20:54 ` Kevin Cernekee [this message]
2014-11-18 21:50 ` [PATCH V2 09/10] serial: earlycon: Set UPIO_MEM32BE based on DT properties Grant Likely
2014-11-19 3:16 ` Rob Herring
2014-11-19 14:43 ` Grant Likely
2014-11-12 20:54 ` [PATCH V2 10/10] serial: pxa: Add OF_EARLYCON support Kevin Cernekee
[not found] ` <1415825647-6024-1-git-send-email-cernekee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-11-13 7:36 ` [PATCH V2 00/10] UART driver support for BMIPS multiplatform kernels Robert Jarzmik
2014-11-13 16:39 ` Kevin Cernekee
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=1415825647-6024-10-git-send-email-cernekee@gmail.com \
--to=cernekee@gmail.com \
--cc=arnd@arndb.de \
--cc=daniel@zonque.org \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=haojian.zhuang@gmail.com \
--cc=jogo@openwrt.org \
--cc=jslaby@suse.cz \
--cc=linux-mips@linux-mips.org \
--cc=linux-serial@vger.kernel.org \
--cc=mbizon@freebox.fr \
--cc=robert.jarzmik@free.fr \
--cc=robh@kernel.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).