* [PATCH 1/2] MIPS: add common header file for DEBUG_LL via NS16550
@ 2012-05-12 7:15 Antony Pavlov
2012-05-12 7:15 ` [PATCH 2/2] MIPS: malta: use common DEBUG_LL code for NS16550 Antony Pavlov
2012-05-13 9:02 ` [PATCH 1/2] MIPS: add common header file for DEBUG_LL via NS16550 Sascha Hauer
0 siblings, 2 replies; 3+ messages in thread
From: Antony Pavlov @ 2012-05-12 7:15 UTC (permalink / raw)
To: barebox
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/mips/include/debug_ll_ns16550.h | 40 ++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 arch/mips/include/debug_ll_ns16550.h
diff --git a/arch/mips/include/debug_ll_ns16550.h b/arch/mips/include/debug_ll_ns16550.h
new file mode 100644
index 0000000..9280219
--- /dev/null
+++ b/arch/mips/include/debug_ll_ns16550.h
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/** @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(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__ */
--
1.7.10
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 2/2] MIPS: malta: use common DEBUG_LL code for NS16550
2012-05-12 7:15 [PATCH 1/2] MIPS: add common header file for DEBUG_LL via NS16550 Antony Pavlov
@ 2012-05-12 7:15 ` Antony Pavlov
2012-05-13 9:02 ` [PATCH 1/2] MIPS: add common header file for DEBUG_LL via NS16550 Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Antony Pavlov @ 2012-05-12 7:15 UTC (permalink / raw)
To: barebox
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/mips/mach-malta/include/mach/debug_ll.h | 11 +----------
arch/mips/mach-malta/include/mach/hardware.h | 1 +
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/arch/mips/mach-malta/include/mach/debug_ll.h b/arch/mips/mach-malta/include/mach/debug_ll.h
index ccc9d9b..9de469b 100644
--- a/arch/mips/mach-malta/include/mach/debug_ll.h
+++ b/arch/mips/mach-malta/include/mach/debug_ll.h
@@ -24,17 +24,8 @@
#ifndef __INCLUDE_ARCH_DEBUG_LL_H__
#define __INCLUDE_ARCH_DEBUG_LL_H__
-#include <io.h>
#include <mach/hardware.h>
-#define rbr 0
-#define lsr 5
-#define LSR_THRE 0x20 /* Xmit holding register empty */
-
-static __inline__ void putc(char ch)
-{
- while (!(__raw_readb(DEBUG_LL_UART_ADDR + lsr) & LSR_THRE));
- __raw_writeb(ch, DEBUG_LL_UART_ADDR + rbr);
-}
+#include <debug_ll_ns16550.h>
#endif /* __INCLUDE_ARCH_DEBUG_LL_H__ */
diff --git a/arch/mips/mach-malta/include/mach/hardware.h b/arch/mips/mach-malta/include/mach/hardware.h
index f827cc3..ddeb1b7 100644
--- a/arch/mips/mach-malta/include/mach/hardware.h
+++ b/arch/mips/mach-malta/include/mach/hardware.h
@@ -22,6 +22,7 @@
#define __INCLUDE_ARCH_HARDWARE_H__
#define DEBUG_LL_UART_ADDR 0xb00003f8
+#define DEBUG_LL_UART_SHIFT 0
/*
* Reset register.
--
1.7.10
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] MIPS: add common header file for DEBUG_LL via NS16550
2012-05-12 7:15 [PATCH 1/2] MIPS: add common header file for DEBUG_LL via NS16550 Antony Pavlov
2012-05-12 7:15 ` [PATCH 2/2] MIPS: malta: use common DEBUG_LL code for NS16550 Antony Pavlov
@ 2012-05-13 9:02 ` Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2012-05-13 9:02 UTC (permalink / raw)
To: Antony Pavlov; +Cc: barebox
On Sat, May 12, 2012 at 11:15:03AM +0400, Antony Pavlov wrote:
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Applied, thanks
Sascha
> ---
> arch/mips/include/debug_ll_ns16550.h | 40 ++++++++++++++++++++++++++++++++++
> 1 file changed, 40 insertions(+)
> create mode 100644 arch/mips/include/debug_ll_ns16550.h
>
> diff --git a/arch/mips/include/debug_ll_ns16550.h b/arch/mips/include/debug_ll_ns16550.h
> new file mode 100644
> index 0000000..9280219
> --- /dev/null
> +++ b/arch/mips/include/debug_ll_ns16550.h
> @@ -0,0 +1,40 @@
> +/*
> + * 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.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> + */
> +
> +/** @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(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__ */
> --
> 1.7.10
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-13 9:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-12 7:15 [PATCH 1/2] MIPS: add common header file for DEBUG_LL via NS16550 Antony Pavlov
2012-05-12 7:15 ` [PATCH 2/2] MIPS: malta: use common DEBUG_LL code for NS16550 Antony Pavlov
2012-05-13 9:02 ` [PATCH 1/2] MIPS: add common header file for DEBUG_LL via NS16550 Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox