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

Commit 19a2c065 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S5P: Moves initial map for merging S5P64X0 



This patch moves some initial maps from plat-s5p to machine,
so that can merge mach-s5p6440 and mach-s5p6450.

Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 13904fba

arch/arm/mach-s5p6440/cpu.c

+33 −4
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5p6440/cpu.c

 *

 * Copyright (c) 2009 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.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
@@ -40,6 +40,32 @@ 
#include <plat/s5p6440.h>

#include <plat/adc-core.h>



/* Initial IO mappings */



static struct map_desc s5p6440_iodesc[] __initdata = {

	{

		.virtual	= (unsigned long)S5P_VA_GPIO,

		.pfn		= __phys_to_pfn(S5P6440_PA_GPIO),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)VA_VIC0,

		.pfn		= __phys_to_pfn(S5P6440_PA_VIC0),

		.length		= SZ_16K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)VA_VIC1,

		.pfn		= __phys_to_pfn(S5P6440_PA_VIC1),

		.length		= SZ_16K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S3C_VA_UART,

		.pfn		= __phys_to_pfn(S3C_PA_UART),

		.length		= SZ_512K,

		.type		= MT_DEVICE,

	}

};



static void s5p6440_idle(void)

{

	unsigned long val;
@@ -55,7 +81,8 @@ static void s5p6440_idle(void) 
	local_irq_enable();

}



/* s5p6440_map_io

/*

 * s5p6440_map_io

 *

 * register the standard cpu IO areas

 */
@@ -64,6 +91,8 @@ void __init s5p6440_map_io(void) 
{

	/* initialize any device information early */

	s3c_adc_setname("s3c64xx-adc");



	iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc));

}



void __init s5p6440_init_clocks(int xtal)

arch/arm/mach-s5p6440/include/mach/map.h

+1 −6
Original line number Diff line number Diff line
@@ -24,23 +24,18 @@ 
#define S5P_PA_SYSCON		S5P6440_PA_SYSCON



#define S5P6440_PA_GPIO		(0xE0308000)

#define S5P_PA_GPIO		S5P6440_PA_GPIO



#define S5P6440_PA_VIC0		(0xE4000000)

#define S5P_PA_VIC0		S5P6440_PA_VIC0

#define S5P6440_PA_VIC1		(0xE4100000)



#define S5P6440_PA_PDMA		0xE9000000



#define S5P6440_PA_VIC1		(0xE4100000)

#define S5P_PA_VIC1		S5P6440_PA_VIC1



#define S5P6440_PA_TIMER	(0xEA000000)

#define S5P_PA_TIMER		S5P6440_PA_TIMER



#define S5P6440_PA_RTC		(0xEA100000)



#define S5P6440_PA_WDT		(0xEA200000)

#define S5P_PA_WDT		S5P6440_PA_WDT



#define S5P6440_PA_UART		(0xEC000000)

arch/arm/mach-s5p6442/cpu.c

+24 −3
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5p6442/cpu.c

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 *		http://www.samsung.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
@@ -47,11 +47,31 @@ static struct map_desc s5p6442_iodesc[] __initdata = { 
		.pfn		= __phys_to_pfn(S5P6442_PA_SYSTIMER),

		.length		= SZ_16K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_GPIO,

		.pfn		= __phys_to_pfn(S5P6442_PA_GPIO),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)VA_VIC0,

		.pfn		= __phys_to_pfn(S5P6442_PA_VIC0),

		.length		= SZ_16K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)VA_VIC1,

		.pfn		= __phys_to_pfn(S5P6442_PA_VIC1),

		.length		= SZ_16K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)VA_VIC2,

		.pfn		= __phys_to_pfn(S5P6442_PA_VIC2),

		.length		= SZ_16K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S3C_VA_UART,

		.pfn		= __phys_to_pfn(S3C_PA_UART),

		.length		= SZ_512K,

		.type		= MT_DEVICE,

	}

};
@@ -63,7 +83,8 @@ static void s5p6442_idle(void) 
	local_irq_enable();

}



/* s5p6442_map_io

/*

 * s5p6442_map_io

 *

 * register the standard cpu IO areas

 */

arch/arm/mach-s5p6442/include/mach/map.h

+0 −6
Original line number Diff line number Diff line
@@ -23,16 +23,10 @@ 
#define S5P_PA_SYSCON		S5P6442_PA_SYSCON



#define S5P6442_PA_GPIO		(0xE0200000)

#define S5P_PA_GPIO		S5P6442_PA_GPIO



#define S5P6442_PA_VIC0		(0xE4000000)

#define S5P_PA_VIC0		S5P6442_PA_VIC0



#define S5P6442_PA_VIC1		(0xE4100000)

#define S5P_PA_VIC1		S5P6442_PA_VIC1



#define S5P6442_PA_VIC2		(0xE4200000)

#define S5P_PA_VIC2		S5P6442_PA_VIC2



#define S5P6442_PA_MDMA		0xE8000000

#define S5P6442_PA_PDMA		0xE9000000

arch/arm/mach-s5pc100/cpu.c

+24 −1
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5pc100/cpu.c

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Copyright 2009 Samsung Electronics Co.

 *	Byungho Min <bhmin@samsung.com>
@@ -56,11 +59,31 @@ static struct map_desc s5pc100_iodesc[] __initdata = { 
		.pfn		= __phys_to_pfn(S5PC100_PA_SYSTIMER),

		.length		= SZ_16K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_GPIO,

		.pfn		= __phys_to_pfn(S5PC100_PA_GPIO),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)VA_VIC0,

		.pfn		= __phys_to_pfn(S5PC100_PA_VIC0),

		.length		= SZ_16K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)VA_VIC1,

		.pfn		= __phys_to_pfn(S5PC100_PA_VIC1),

		.length		= SZ_16K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)VA_VIC2,

		.pfn		= __phys_to_pfn(S5P_PA_VIC2),

		.pfn		= __phys_to_pfn(S5PC100_PA_VIC2),

		.length		= SZ_16K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S3C_VA_UART,

		.pfn		= __phys_to_pfn(S3C_PA_UART),

		.length		= SZ_512K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5PC100_VA_OTHERS,

		.pfn		= __phys_to_pfn(S5PC100_PA_OTHERS),