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

Commit be297f03 authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files

ARM: S5P: Move SROM controller IO mapping to plat-s5p for S5P SoCs 



This patch modifies the following.

1. Moves the SROM controller mapping from S5PV210 specific code to
   S5P common code. The SROM controller mapping can be used for all
   S5P SoCs.

2. Define the SROM controller physical address for S5P64X0, S5P6442,
   S5PC100, S5PV210 and S5PV310.

Signed-off-by: default avatarThomas Abraham <thomas.ab@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 8233ab6a

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

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
#define S5P6442_PA_VIC1		(0xE4100000)

#define S5P6442_PA_VIC2		(0xE4200000)



#define S5P6442_PA_SROMC	(0xE7000000)

#define S5P_PA_SROMC		S5P6442_PA_SROMC



#define S5P6442_PA_MDMA		0xE8000000

#define S5P6442_PA_PDMA		0xE9000000

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

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
#define S5P64X0_PA_VIC0		(0xE4000000)

#define S5P64X0_PA_VIC1		(0xE4100000)



#define S5P64X0_PA_SROMC	(0xE7000000)

#define S5P_PA_SROMC		S5P64X0_PA_SROMC



#define S5P64X0_PA_PDMA		(0xE9000000)



#define S5P64X0_PA_TIMER	(0xEA000000)

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

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ 
#define S5PC100_VA_VIC_OFFSET	0x10000

#define S5PC1XX_VA_VIC(x)	(S5PC100_VA_VIC + ((x) * S5PC100_VA_VIC_OFFSET))



#define S5PC100_PA_SROMC	(0xE7000000)

#define S5P_PA_SROMC		S5PC100_PA_SROMC



#define S5PC100_PA_ONENAND	(0xE7100000)

arch/arm/mach-s5pv210/cpu.c

+0 −5
Original line number Diff line number Diff line
@@ -80,11 +80,6 @@ static struct map_desc s5pv210_iodesc[] __initdata = { 
		.pfn		= __phys_to_pfn(S3C_PA_UART),

		.length		= SZ_512K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_SROMC,

		.pfn		= __phys_to_pfn(S5PV210_PA_SROMC),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_DMC0,

		.pfn		= __phys_to_pfn(S5PV210_PA_DMC0),

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

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#define S3C_VA_UARTx(x)		(S3C_VA_UART + ((x) * S3C_UART_OFFSET))



#define S5PV210_PA_SROMC	(0xE8000000)

#define S5P_PA_SROMC		S5PV210_PA_SROMC



#define S5PV210_PA_CFCON	(0xE8200000)