Commit 31adb06f authored by Barry Song's avatar Barry Song Committed by Barry Song
Browse files

ARM: CSR: mapping early DEBUG_LL uart 



Signed-off-by: default avatarBarry Song <baohua.song@csr.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 02c981c0

arch/arm/mach-prima2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-prima2/common.h

+6 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-prima2/lluart.c

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * 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);

}

arch/arm/mach-prima2/prima2.c

+1 −0
Original line number Diff line number Diff line
@@ -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,