From: Antony Pavlov <antonynpavlov@gmail.com>
To: barebox@lists.infradead.org
Subject: [PATCH 2/2] MIPS: rzx50: switch to common mach-xburst serial code
Date: Tue, 7 May 2013 12:51:26 +0400 [thread overview]
Message-ID: <1367916686-12975-3-git-send-email-antonynpavlov@gmail.com> (raw)
In-Reply-To: <1367916686-12975-1-git-send-email-antonynpavlov@gmail.com>
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/mips/boards/rzx50/serial.c | 37 ++-----------------------------------
1 file changed, 2 insertions(+), 35 deletions(-)
diff --git a/arch/mips/boards/rzx50/serial.c b/arch/mips/boards/rzx50/serial.c
index 5230aaa..129806d 100644
--- a/arch/mips/boards/rzx50/serial.c
+++ b/arch/mips/boards/rzx50/serial.c
@@ -16,47 +16,14 @@
*/
#include <common.h>
-#include <types.h>
-#include <driver.h>
#include <init.h>
-#include <ns16550.h>
+#include <mach/devices.h>
#include <mach/jz4750d_regs.h>
-#include <io.h>
-#include <asm/common.h>
-
-#define JZ4750D_UART_SHIFT 2
-
-#define ier (1 << JZ4750D_UART_SHIFT)
-#define fcr (2 << JZ4750D_UART_SHIFT)
-
-static void jz4750d_serial_reg_write(unsigned int val, unsigned long base,
- unsigned char reg_offset)
-{
- switch (reg_offset) {
- case fcr:
- val |= 0x10; /* Enable uart module */
- break;
- case ier:
- val |= (val & 0x4) << 2;
- break;
- default:
- break;
- }
-
- writeb(val & 0xff, (void *)(base + reg_offset));
-}
-
-static struct NS16550_plat serial_plat = {
- .clock = 12000000,
- .shift = JZ4750D_UART_SHIFT,
- .reg_write = &jz4750d_serial_reg_write,
-};
static int rzx50_console_init(void)
{
/* Register the serial port */
- add_ns16550_device(DEVICE_ID_DYNAMIC, UART1_BASE, 8 << JZ4750D_UART_SHIFT,
- IORESOURCE_MEM_8BIT, &serial_plat);
+ jz_add_uart(DEVICE_ID_DYNAMIC, UART1_BASE, 12000000);
return 0;
}
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-05-07 8:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-07 8:51 MIPS: xburst: use common " Antony Pavlov
2013-05-07 8:51 ` [PATCH 1/2] " Antony Pavlov
2013-05-07 8:51 ` Antony Pavlov [this message]
2013-05-08 7:37 ` Sascha Hauer
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=1367916686-12975-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