From mboxrd@z Thu Jan 1 00:00:00 1970 From: andrew@lunn.ch (Andrew Lunn) Date: Tue, 3 Jul 2012 17:13:42 +0200 Subject: [PATCH 2/9] arm: mach-mvebu: add header In-Reply-To: <1341243574-3258-3-git-send-email-thomas.petazzoni@free-electrons.com> References: <1341243574-3258-1-git-send-email-thomas.petazzoni@free-electrons.com> <1341243574-3258-3-git-send-email-thomas.petazzoni@free-electrons.com> Message-ID: <20120703151342.GF17534@lunn.ch> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Jul 02, 2012 at 05:39:27PM +0200, Thomas Petazzoni wrote: > Signed-off-by: Gregory CLEMENT > Signed-off-by: Thomas Petazzoni > Signed-off-by: Lior Amsalem > --- > arch/arm/mach-mvebu/include/mach/debug-macro.S | 24 +++++++++++++ > arch/arm/mach-mvebu/include/mach/timex.h | 13 +++++++ > arch/arm/mach-mvebu/include/mach/uncompress.h | 43 ++++++++++++++++++++++++ > 3 files changed, 80 insertions(+) > create mode 100644 arch/arm/mach-mvebu/include/mach/debug-macro.S > create mode 100644 arch/arm/mach-mvebu/include/mach/timex.h > create mode 100644 arch/arm/mach-mvebu/include/mach/uncompress.h > > diff --git a/arch/arm/mach-mvebu/include/mach/debug-macro.S b/arch/arm/mach-mvebu/include/mach/debug-macro.S > new file mode 100644 > index 0000000..2282576 > --- /dev/null > +++ b/arch/arm/mach-mvebu/include/mach/debug-macro.S > @@ -0,0 +1,24 @@ > +/* > + * Early serial output macro for Marvell SoC > + * > + * Copyright (C) 2012 Marvell > + * > + * Lior Amsalem > + * Gregory Clement > + * > + * 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. > +*/ > + > +#include > + > + .macro addruart, rp, rv, tmp > + ldr \rp, =ARMADA_370_XP_REGS_PHYS_BASE > + ldr \rv, =ARMADA_370_XP_REGS_VIRT_BASE > + orr \rp, \rp, #0x00012000 > + orr \rv, \rv, #0x00012000 > + .endm > + > +#define UART_SHIFT 2 > +#include > diff --git a/arch/arm/mach-mvebu/include/mach/timex.h b/arch/arm/mach-mvebu/include/mach/timex.h > new file mode 100644 > index 0000000..ab324a3 > --- /dev/null > +++ b/arch/arm/mach-mvebu/include/mach/timex.h > @@ -0,0 +1,13 @@ > +/* > + * Marvell Armada SoC time definitions > + * > + * Copyright (C) 2012 Marvell > + * > + * Lior Amsalem > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any > + * warranty of any kind, whether express or implied. > + */ > + > +#define CLOCK_TICK_RATE (100 * HZ) > diff --git a/arch/arm/mach-mvebu/include/mach/uncompress.h b/arch/arm/mach-mvebu/include/mach/uncompress.h > new file mode 100644 > index 0000000..d6a100c > --- /dev/null > +++ b/arch/arm/mach-mvebu/include/mach/uncompress.h > @@ -0,0 +1,43 @@ > +/* > + * Marvell Armada SoC kernel uncompression UART routines > + * > + * Copyright (C) 2012 Marvell > + * > + * Lior Amsalem > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any > + * warranty of any kind, whether express or implied. > + */ > + > +#include > + > +#define UART_THR ((volatile unsigned char *)(ARMADA_370_XP_REGS_PHYS_BASE\ > + + 0x12000)) > +#define UART_LSR ((volatile unsigned char *)(ARMADA_370_XP_REGS_PHYS_BASE\ > + + 0x12014)) > + > +#define LSR_THRE 0x20 > + > +static void putc(const char c) > +{ > + int i; > + > + for (i = 0; i < 0x1000; i++) { > + /* Transmit fifo not full? */ > + if (*UART_LSR & LSR_THRE) > + break; > + } > + > + *UART_THR = c; > +} > + > +static void flush(void) > +{ > +} > + > +/* > + * nothing to do > + */ > +#define arch_decomp_setup() > +#define arch_decomp_wdog() > -- > 1.7.9.5 > Acked-by: Andrew Lunn