Skip to content

Commit

Permalink
ARM: CSR: mapping early DEBUG_LL uart
Browse files Browse the repository at this point in the history
Signed-off-by: Barry Song <baohua.song@csr.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Barry Song authored and Barry Song committed Jul 8, 2011
1 parent 02c981c commit 31adb06
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-prima2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ obj-y += irq.o
obj-y += clock.o
obj-y += rstc.o
obj-y += prima2.o
obj-$(CONFIG_DEBUG_LL) += lluart.o
6 changes: 6 additions & 0 deletions arch/arm/mach-prima2/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,10 @@ extern struct sys_timer sirfsoc_timer;
extern void __init sirfsoc_of_irq_init(void);
extern void __init sirfsoc_of_clk_init(void);

#ifndef CONFIG_DEBUG_LL
static inline void sirfsoc_map_lluart(void) {}
#else
extern void __init sirfsoc_map_lluart(void);
#endif

#endif
25 changes: 25 additions & 0 deletions arch/arm/mach-prima2/lluart.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Static memory mapping for DEBUG_LL
*
* Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
*
* Licensed under GPLv2 or later.
*/

#include <linux/kernel.h>
#include <asm/page.h>
#include <asm/mach/map.h>
#include <mach/map.h>
#include <mach/uart.h>

void __init sirfsoc_map_lluart(void)
{
struct map_desc sirfsoc_lluart_map = {
.virtual = SIRFSOC_UART1_VA_BASE,
.pfn = __phys_to_pfn(SIRFSOC_UART1_PA_BASE),
.length = SIRFSOC_UART1_SIZE,
.type = MT_DEVICE,
};

iotable_init(&sirfsoc_lluart_map, 1);
}
1 change: 1 addition & 0 deletions arch/arm/mach-prima2/prima2.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ MACHINE_START(PRIMA2_EVB, "prima2cb")
/* Maintainer: Barry Song <baohua.song@csr.com> */
.boot_params = 0x00000100,
.init_early = sirfsoc_of_clk_init,
.map_io = sirfsoc_map_lluart,
.init_irq = sirfsoc_of_irq_init,
.timer = &sirfsoc_timer,
.init_machine = sirfsoc_mach_init,
Expand Down

0 comments on commit 31adb06

Please sign in to comment.