Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1805f4d6 authored by Barry Song's avatar Barry Song
Browse files

ARM: sirf: move to debug_ll_io_init and drop map_io 



This patch moves to debug_ll_io_init(), then finally drops CSR map_io()
machine callbacks.

Signed-off-by: default avatarBarry Song <Baohua.Song@csr.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent a7ae982f

arch/arm/mach-prima2/Makefile

+0 −1
Original line number Original line Diff line number Diff line 
obj-y += rstc.o

obj-y += rstc.o

obj-y += common.o

obj-y += common.o

obj-y += rtciobrg.o

obj-y += rtciobrg.o

obj-$(CONFIG_DEBUG_LL) += lluart.o

obj-$(CONFIG_SUSPEND) += pm.o sleep.o

obj-$(CONFIG_SUSPEND) += pm.o sleep.o

obj-$(CONFIG_SMP) += platsmp.o headsmp.o

obj-$(CONFIG_SMP) += platsmp.o headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)  += hotplug.o

obj-$(CONFIG_HOTPLUG_CPU)  += hotplug.o

arch/arm/mach-prima2/common.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -20,11 +20,6 @@ static void __init sirfsoc_init_late(void) 
	sirfsoc_pm_init();

	sirfsoc_pm_init();

}

}





static __init void sirfsoc_map_io(void)

{

	sirfsoc_map_lluart();

}



#ifdef CONFIG_ARCH_ATLAS6

#ifdef CONFIG_ARCH_ATLAS6

static const char *atlas6_dt_match[] __initconst = {

static const char *atlas6_dt_match[] __initconst = {

	"sirf,atlas6",

	"sirf,atlas6",
@@ -35,7 +30,6 @@ DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)") 
	/* Maintainer: Barry Song <baohua.song@csr.com> */

	/* Maintainer: Barry Song <baohua.song@csr.com> */

	.l2c_aux_val	= 0,

	.l2c_aux_val	= 0,

	.l2c_aux_mask	= ~0,

	.l2c_aux_mask	= ~0,

	.map_io         = sirfsoc_map_io,

	.init_late	= sirfsoc_init_late,

	.init_late	= sirfsoc_init_late,

	.dt_compat      = atlas6_dt_match,

	.dt_compat      = atlas6_dt_match,

MACHINE_END

MACHINE_END
@@ -51,7 +45,6 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") 
	/* Maintainer: Barry Song <baohua.song@csr.com> */

	/* Maintainer: Barry Song <baohua.song@csr.com> */

	.l2c_aux_val	= 0,

	.l2c_aux_val	= 0,

	.l2c_aux_mask	= ~0,

	.l2c_aux_mask	= ~0,

	.map_io         = sirfsoc_map_io,

	.dma_zone_size	= SZ_256M,

	.dma_zone_size	= SZ_256M,

	.init_late	= sirfsoc_init_late,

	.init_late	= sirfsoc_init_late,

	.dt_compat      = prima2_dt_match,

	.dt_compat      = prima2_dt_match,

arch/arm/mach-prima2/lluart.c

deleted100644 → 0
+0 −33
Original line number Original line 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 "common.h"



#if defined(CONFIG_DEBUG_SIRFPRIMA2_UART1)

#define SIRFSOC_UART1_PA_BASE          0xb0060000

#else

#define SIRFSOC_UART1_PA_BASE          0

#endif



#define SIRFSOC_UART1_VA_BASE          SIRFSOC_VA(0x060000)

#define SIRFSOC_UART1_SIZE		SZ_4K



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

}