From: andrew@lunn•ch (Andrew Lunn)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 2/9] arm: mach-mvebu: add header
Date: Tue, 3 Jul 2012 17:13:42 +0200 [thread overview]
Message-ID: <20120703151342.GF17534@lunn.ch> (raw)
In-Reply-To: <1341243574-3258-3-git-send-email-thomas.petazzoni@free-electrons.com>
On Mon, Jul 02, 2012 at 05:39:27PM +0200, Thomas Petazzoni wrote:
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons•com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons•com>
> Signed-off-by: Lior Amsalem <alior@marvell•com>
> ---
> 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 <alior@marvell•com>
> + * Gregory Clement <gregory.clement@free-electrons•com>
> + *
> + * 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 <mach/armada-370-xp.h>
> +
> + .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 <asm/hardware/debug-8250.S>
> 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 <alior@marvell•com>
> + *
> + * 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 <alior@marvell•com>
> + *
> + * 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 <mach/armada-370-xp.h>
> +
> +#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 <andrew@lunn•ch>
next prev parent reply other threads:[~2012-07-03 15:13 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-02 15:39 [PATCH v7] arm: Add basic support for new Marvell Armada 370 and Armada XP SoC Thomas Petazzoni
2012-07-02 15:39 ` [PATCH 1/9] clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver Thomas Petazzoni
2012-07-02 17:40 ` Thomas Gleixner
2012-07-03 15:12 ` Andrew Lunn
2012-07-02 15:39 ` [PATCH 2/9] arm: mach-mvebu: add header Thomas Petazzoni
2012-07-02 18:33 ` Andrew Lunn
2012-07-02 19:08 ` Thomas Petazzoni
2012-07-02 19:16 ` Andrew Lunn
2012-07-02 21:31 ` Arnd Bergmann
2012-07-03 3:48 ` Nicolas Pitre
2012-07-03 7:09 ` Andrew Lunn
2012-07-03 7:20 ` Thomas Petazzoni
2012-07-03 15:13 ` Andrew Lunn [this message]
2012-07-02 15:39 ` [PATCH 3/9] arm: mach-mvebu: add source files Thomas Petazzoni
2012-07-03 15:16 ` Andrew Lunn
2012-07-02 15:39 ` [PATCH 4/9] arm: mach-mvebu: add support for Armada 370 and Armada XP with DT Thomas Petazzoni
2012-07-03 15:36 ` Andrew Lunn
2012-07-02 15:39 ` [PATCH 5/9] arm: mach-mvebu: add documentation for new device tree bindings Thomas Petazzoni
2012-07-02 15:39 ` [PATCH 6/9] arm: mach-mvebu: add defconfig Thomas Petazzoni
2012-07-02 15:39 ` [PATCH 7/9] arm: mach-mvebu: add compilation/configuration change Thomas Petazzoni
2012-07-03 15:41 ` Andrew Lunn
2012-07-02 15:39 ` [PATCH 8/9] arm: mach-mvebu: add entry to MAINTAINERS Thomas Petazzoni
2012-07-02 15:39 ` [PATCH 9/9] ARM: mvebu: MPIC: read number of interrupts from control register Thomas Petazzoni
2012-07-03 17:20 ` [PATCH v7] arm: Add basic support for new Marvell Armada 370 and Armada XP SoC Ben Dooks
2012-07-04 12:11 ` Yehuda Yitschak
2012-07-04 13:54 ` Lior Amsalem
-- strict thread matches above, loose matches on Subject: below --
2012-07-02 11:33 [PATCH v6] " Thomas Petazzoni
2012-07-02 11:33 ` [PATCH 2/9] arm: mach-mvebu: add header Thomas Petazzoni
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=20120703151342.GF17534@lunn.ch \
--to=andrew@lunn$(echo .)ch \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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