From: Antony Pavlov <antonynpavlov@gmail.com>
To: barebox@lists.infradead.org
Subject: [PATCH 6/6] MIPS: unificate ns16550 debug_ll support code
Date: Sat, 1 Jun 2013 11:52:49 +0400 [thread overview]
Message-ID: <1370073169-29009-7-git-send-email-antonynpavlov@gmail.com> (raw)
In-Reply-To: <1370073169-29009-1-git-send-email-antonynpavlov@gmail.com>
This commit moves the C debug_ll code from
the MIPS <debug_ll_ns16550.h> header file to
the MIPS <asm/debug_ll_ns16550.h> header file,
so the C code and the asm code can use the same
register address macros.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/mips/include/asm/debug_ll_ns16550.h | 15 ++++++++++
arch/mips/include/debug_ll_ns16550.h | 37 -------------------------
arch/mips/mach-malta/include/mach/debug_ll.h | 2 +-
arch/mips/mach-xburst/include/mach/debug_ll.h | 2 +-
4 files changed, 17 insertions(+), 39 deletions(-)
delete mode 100644 arch/mips/include/debug_ll_ns16550.h
diff --git a/arch/mips/include/asm/debug_ll_ns16550.h b/arch/mips/include/asm/debug_ll_ns16550.h
index 5dd1b39..f00f348 100644
--- a/arch/mips/include/asm/debug_ll_ns16550.h
+++ b/arch/mips/include/asm/debug_ll_ns16550.h
@@ -48,6 +48,20 @@
#define UART_LSR_THRE 0x20 /* Xmit holding register empty */
+#ifndef __ASSEMBLY__
+/*
+ * C macros
+ */
+
+#include <asm/io.h>
+
+static __inline__ void PUTC_LL(char ch)
+{
+ while (!(__raw_readb((u8 *)DEBUG_LL_UART_ADDR + UART_LSR) & UART_LSR_THRE))
+ ;
+ __raw_writeb(ch, (u8 *)DEBUG_LL_UART_ADDR + UART_THR);
+}
+#else /* __ASSEMBLY__ */
/*
* Macros for use in assembly language code
*/
@@ -96,5 +110,6 @@
debug_ll_ns16550_outc '\n'
#endif /* CONFIG_DEBUG_LL */
.endm
+#endif /* __ASSEMBLY__ */
#endif /* __INCLUDE_MIPS_ASM_DEBUG_LL_NS16550_H__ */
diff --git a/arch/mips/include/debug_ll_ns16550.h b/arch/mips/include/debug_ll_ns16550.h
deleted file mode 100644
index e9c7ecf..0000000
--- a/arch/mips/include/debug_ll_ns16550.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2012 Antony Pavlov <antonynpavlov@gmail.com>
- *
- * This file is part of barebox.
- * See file CREDITS for list of people who contributed to this project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-/** @file
- * This file contains declaration for early output support
- */
-#ifndef __INCLUDE_ARCH_DEBUG_LL_NS16550_H__
-#define __INCLUDE_ARCH_DEBUG_LL_NS16550_H__
-
-#include <asm/io.h>
-
-#define rbr (0 << DEBUG_LL_UART_SHIFT)
-#define lsr (5 << DEBUG_LL_UART_SHIFT)
-
-#define LSR_THRE 0x20 /* Xmit holding register empty */
-
-static __inline__ void PUTC_LL(char ch)
-{
- while (!(__raw_readb((u8 *)DEBUG_LL_UART_ADDR + lsr) & LSR_THRE));
- __raw_writeb(ch, (u8 *)DEBUG_LL_UART_ADDR + rbr);
-}
-
-#endif /* __INCLUDE_ARCH_DEBUG_LL_NS16550_H__ */
diff --git a/arch/mips/mach-malta/include/mach/debug_ll.h b/arch/mips/mach-malta/include/mach/debug_ll.h
index 3a91c93..3e8b01b 100644
--- a/arch/mips/mach-malta/include/mach/debug_ll.h
+++ b/arch/mips/mach-malta/include/mach/debug_ll.h
@@ -23,6 +23,6 @@
#include <mach/hardware.h>
-#include <debug_ll_ns16550.h>
+#include <asm/debug_ll_ns16550.h>
#endif /* __INCLUDE_ARCH_DEBUG_LL_H__ */
diff --git a/arch/mips/mach-xburst/include/mach/debug_ll.h b/arch/mips/mach-xburst/include/mach/debug_ll.h
index f260e65..6c3c980 100644
--- a/arch/mips/mach-xburst/include/mach/debug_ll.h
+++ b/arch/mips/mach-xburst/include/mach/debug_ll.h
@@ -22,6 +22,6 @@
* This File contains declaration for early output support
*/
#include <board/debug_ll.h>
-#include <debug_ll_ns16550.h>
+#include <asm/debug_ll_ns16550.h>
#endif /* __MACH_XBURST_DEBUG_LL__ */
--
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-06-01 7:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-01 7:52 [PATCH 0/6] MIPS: rework ns16550 debug_ll Antony Pavlov
2013-06-01 7:52 ` [PATCH 1/6] MIPS: XBurst: use mach-specific debug_ll setup Antony Pavlov
2013-06-01 7:52 ` [PATCH 2/6] MIPS: pbl: add low-level debug asm macros for ns16550 Antony Pavlov
2013-06-01 7:52 ` [PATCH 3/6] MIPS: rzx50: pbl: use debug_ll Antony Pavlov
2013-06-03 7:31 ` Sascha Hauer
2013-06-03 7:46 ` antonynpavlov
2013-06-01 7:52 ` [PATCH 4/6] MIPS: rzx50_defconfig: use UART1 for low-level debug Antony Pavlov
2013-06-01 7:52 ` [PATCH 5/6] MIPS: malta: adapt for new debug_ll Antony Pavlov
2013-06-01 7:52 ` Antony Pavlov [this message]
2013-06-01 8:07 ` [PATCH 6/6] MIPS: unificate ns16550 debug_ll support code antonynpavlov
2013-06-02 9:25 ` 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=1370073169-29009-7-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