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

Commit 81317960 authored by Kukjin Kim's avatar Kukjin Kim Committed by Ben Dooks
Browse files

ARM: S5P6440: Move common memory map definitions for S5P 



1. Moved common memory map definitions for S5P such as S5P_VA_XXX
   into plat-s5p/include/mach/map-s5p.h from mach-s5p6440/include/mach.
2. Removed unnecessary definitions in the map.h and irq.c
3. Removed the unnecessary support for unaligned UART address
4. Renamed S5P_VA_VICx definitions as VA_VICx
5. Moved the definitons of VIC_BASE to plat-s5p/include/plat/irqs.h

Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent e96b234b

arch/arm/mach-s5p6440/include/mach/debug-macro.S

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
	.macro addruart, rx

		mrc	p15, 0, \rx, c1, c0

		tst	\rx, #1

		ldreq	\rx, = S5P_PA_UART

		ldrne	\rx, = (S5P_VA_UART + S5P_PA_UART & 0xfffff)

		ldreq	\rx, = S3C_PA_UART

		ldrne	\rx, = S3C_VA_UART

#if CONFIG_DEBUG_S3C_UART != 0

		add	\rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART)

#endif

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

+13 −52
Original line number Diff line number Diff line
@@ -14,94 +14,55 @@ 
#define __ASM_ARCH_MAP_H __FILE__



#include <plat/map-base.h>

#include <plat/map-s5p.h>



/* Chip ID */

#define S5P6440_PA_CHIPID	(0xE0000000)

#define S5P_PA_CHIPID		S5P6440_PA_CHIPID

#define S5P_VA_CHIPID		S3C_ADDR(0x00700000)



/* SYSCON */

#define S5P6440_PA_SYSCON	(0xE0100000)

#define S5P_PA_SYSCON		S5P6440_PA_SYSCON

#define S5P_VA_SYSCON		S3C_VA_SYS



#define S5P6440_PA_CLK		(S5P6440_PA_SYSCON + 0x0)

#define S5P_PA_CLK		S5P6440_PA_CLK

#define S5P_VA_CLK		(S5P_VA_SYSCON + 0x0)

#define S5P_PA_SYSCON		S5P6440_PA_SYSCON



/* GPIO */

#define S5P6440_PA_GPIO		(0xE0308000)

#define S5P_PA_GPIO		S5P6440_PA_GPIO

#define S5P_VA_GPIO		S3C_ADDR(0x00500000)



/* VIC0 */

#define S5P6440_PA_VIC0		(0xE4000000)

#define S5P_PA_VIC0		S5P6440_PA_VIC0

#define S5P_VA_VIC0		(S3C_VA_IRQ + 0x0)

#define VA_VIC0			S5P_VA_VIC0



/* VIC1 */

#define S5P6440_PA_VIC1		(0xE4100000)

#define S5P_PA_VIC1		S5P6440_PA_VIC1

#define S5P_VA_VIC1		(S3C_VA_IRQ + 0x10000)

#define VA_VIC1			S5P_VA_VIC1



/* Timer */

#define S5P6440_PA_TIMER	(0xEA000000)

#define S5P_PA_TIMER		S5P6440_PA_TIMER

#define S5P_VA_TIMER		S3C_VA_TIMER



/* RTC */

#define S5P6440_PA_RTC		(0xEA100000)

#define S5P_PA_RTC		S5P6440_PA_RTC

#define S5P_VA_RTC		S3C_ADDR(0x00600000)



/* WDT */

#define S5P6440_PA_WDT		(0xEA200000)

#define S5P_PA_WDT		S5P6440_PA_WDT

#define S5p_VA_WDT		S3C_VA_WATCHDOG



/* UART */

#define S5P6440_PA_UART		(0xEC000000)

#define S5P_PA_UART		S5P6440_PA_UART

#define S5P_VA_UART		S3C_VA_UART



/* HS USB OtG */

#define S5P_PA_UART0		(S5P6440_PA_UART + 0x0)

#define S5P_PA_UART1		(S5P6440_PA_UART + 0x400)

#define S5P_PA_UART2		(S5P6440_PA_UART + 0x800)

#define S5P_PA_UART3		(S5P6440_PA_UART + 0xC00)



#define S5P_SZ_UART		SZ_256



#define S5P6440_PA_IIC0		(0xEC104000)



#define S5P6440_PA_HSOTG	(0xED100000)



/* HSMMC */

#define S5P6440_PA_HSMMC0	(0xED800000)

#define S5P6440_PA_HSMMC1	(0xED900000)

#define S5P6440_PA_HSMMC2	(0xEDA00000)



#define S5P_PA_UART0		(S5P_PA_UART + 0x0)

#define S5P_PA_UART1		(S5P_PA_UART + 0x400)

#define S5P_PA_UART2		(S5P_PA_UART + 0x800)

#define S5P_PA_UART3		(S5P_PA_UART + 0xC00)

#define S5P_UART_OFFSET		(0x400)



#define S5P_VA_UARTx(x)		(S5P_VA_UART + (S5P_PA_UART & 0xfffff) \

				+ ((x) * S5P_UART_OFFSET))



#define S5P_VA_UART0		S5P_VA_UARTx(0)

#define S5P_VA_UART1		S5P_VA_UARTx(1)

#define S5P_VA_UART2		S5P_VA_UARTx(2)

#define S5P_VA_UART3		S5P_VA_UARTx(3)

#define S5P_SZ_UART		SZ_256



/* I2C */

#define S5P6440_PA_IIC0		(0xEC104000)

#define S5P_PA_IIC0		S5P6440_PA_IIC0

#define S5p_VA_IIC0		S3C_ADDR(0x00700000)



/* SDRAM */

#define S5P6440_PA_SDRAM	(0x20000000)

#define S5P_PA_SDRAM		S5P6440_PA_SDRAM



/* compatibiltiy defines. */

#define S3C_PA_UART		S5P_PA_UART

#define S3C_UART_OFFSET		S5P_UART_OFFSET

#define S3C_PA_TIMER		S5P_PA_TIMER

#define S3C_PA_IIC		S5P_PA_IIC0

#define S3C_PA_UART		S5P6440_PA_UART

#define S3C_PA_IIC		S5P6440_PA_IIC0



#endif /* __ASM_ARCH_MAP_H */

arch/arm/mach-s5p6440/include/mach/regs-clock.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#include <mach/map.h>



#define S5P_CLKREG(x)		(S5P_VA_CLK + (x))

#define S5P_CLKREG(x)		(S3C_VA_SYS + (x))



#define S5P_APLL_LOCK		S5P_CLKREG(0x00)

#define S5P_MPLL_LOCK		S5P_CLKREG(0x04)

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


static inline u32 s3c24xx_ostimer_pending(void)

{

	u32 pend = __raw_readl(S5P_VA_VIC0 + VIC_RAW_STATUS);

	u32 pend = __raw_readl(VA_VIC0 + VIC_RAW_STATUS);

	return pend & (1 << (IRQ_TIMER4_VIC - S5P_IRQ_VIC0(0)));

}

arch/arm/mach-s5p6440/mach-smdk6440.c

+2 −2
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ static void __init smdk6440_machine_init(void) 


MACHINE_START(SMDK6440, "SMDK6440")

	/* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */

	.phys_io	= S5P_PA_UART & 0xfff00000,

	.io_pg_offst	= (((u32)S5P_VA_UART) >> 18) & 0xfffc,

	.phys_io	= S3C_PA_UART & 0xfff00000,

	.io_pg_offst	= (((u32)S3C_VA_UART) >> 18) & 0xfffc,

	.boot_params	= S5P_PA_SDRAM + 0x100,



	.init_irq	= s5p6440_init_irq,