From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 01/18] dm: ns16550: Support CONFIG_SYS_NS16550_MEM32 with driver model
Date: Tue, 12 May 2015 14:55:02 -0600 [thread overview]
Message-ID: <1431464119-21574-2-git-send-email-sjg@chromium.org> (raw)
In-Reply-To: <1431464119-21574-1-git-send-email-sjg@chromium.org>
This option is used by some boards, so support it with driver model. This
is really ugly - we should rewrite this driver once all users are moved to
driver model.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Simplify the support for CONFIG_SYS_NS16550_MEM32
drivers/serial/ns16550.c | 4 ++++
include/ns16550.h | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 3d376d7..9b044a3 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -65,6 +65,8 @@ static inline void serial_out_shift(void *addr, int shift, int value)
out_le32(addr, value);
#elif defined(CONFIG_SYS_NS16550_MEM32) && defined(CONFIG_SYS_BIG_ENDIAN)
out_be32(addr, value);
+#elif defined(CONFIG_SYS_NS16550_MEM32)
+ writel(value, addr);
#elif defined(CONFIG_SYS_BIG_ENDIAN)
writeb(value, addr + (1 << shift) - 1);
#else
@@ -80,6 +82,8 @@ static inline int serial_in_shift(void *addr, int shift)
return in_le32(addr);
#elif defined(CONFIG_SYS_NS16550_MEM32) && defined(CONFIG_SYS_BIG_ENDIAN)
return in_be32(addr);
+#elif defined(CONFIG_SYS_NS16550_MEM32)
+ return readl(addr);
#elif defined(CONFIG_SYS_BIG_ENDIAN)
return readb(addr + (1 << shift) - 1);
#else
diff --git a/include/ns16550.h b/include/ns16550.h
index 0607379..4e62067 100644
--- a/include/ns16550.h
+++ b/include/ns16550.h
@@ -33,7 +33,7 @@
#if !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0)
#error "Please define NS16550 registers size."
-#elif defined(CONFIG_SYS_NS16550_MEM32)
+#elif defined(CONFIG_SYS_NS16550_MEM32) && !defined(CONFIG_DM_SERIAL)
#define UART_REG(x) u32 x
#elif (CONFIG_SYS_NS16550_REG_SIZE > 0)
#define UART_REG(x) \
--
2.2.0.rc0.207.ga3a616c
next prev parent reply other threads:[~2015-05-12 20:55 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-12 20:55 [U-Boot] [PATCH v2 00/18] dm: Introduce device tree support in SPL (for Rockchip) Simon Glass
2015-05-12 20:55 ` Simon Glass [this message]
2015-06-11 20:19 ` [U-Boot] [PATCH v2 01/18] dm: ns16550: Support CONFIG_SYS_NS16550_MEM32 with driver model Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 02/18] fdt: arm: Drop device tree padding Simon Glass
2015-06-11 20:19 ` Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 03/18] dts: Disable device tree for SPL on all boards Simon Glass
2015-06-11 20:19 ` Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 04/18] dm: serial: Don't support CONFIG_CONS_INDEX with device tree Simon Glass
2015-06-11 20:19 ` Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 05/18] Add a simple version of memalign() Simon Glass
2015-06-11 20:19 ` Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 06/18] Remove SPL undefine of CONFIG_OF_CONTROL Simon Glass
2015-06-11 20:19 ` Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 07/18] mkimage: Display a better list of available image types Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 08/18] fdt: Add a function to remove unused strings from a device tree Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 09/18] fdt: Add fdt_first/next_region() functions Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 10/18] fdt: Add fdtgrep tool Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 11/18] dm: Reduce SPL device tree size Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 12/18] dm: rockchip: Add serial support Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 13/18] rockchip: Bring in RK3288 device tree file includes and bindings Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 14/18] rockchip: Add base SoC files Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 15/18] rockchip: Add basic support for firefly-rk3288 Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 16/18] rockchip: Add the beginnings of an image tool Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 17/18] rockchip: Add a simple README Simon Glass
2015-05-12 20:55 ` [U-Boot] [PATCH v2 18/18] rockchip: Add basic support for jerry Simon Glass
2015-06-04 23:48 ` [U-Boot] [PATCH v2 00/18] dm: Introduce device tree support in SPL (for Rockchip) Simon Glass
2015-06-11 2:50 ` Simon Glass
2015-06-11 12:15 ` Tom Rini
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=1431464119-21574-2-git-send-email-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/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