ARM: S5P: Remove fixed uart offset dependent code (88baf209) · Commits · 戴 / test

The uart offset between channels has been 0x400 for all S5P series and to present virtual and physical offsets, both number 0x400 and S3C_UART_OFFSET have been used together. This patch removes the use of the number 0x400 and expands the virtual mapping size of S3C_VA_UART from 4KB to 512KB to support the CPU with S3C_UART_OFFSET being 0x10000. Signed-off-by:

Changhwan Youn <chaos.youn@samsung.com> Signed-off-by:

Kukjin Kim <kgene.kim@samsung.com>

arch/arm/plat-s5p/cpu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ static struct map_desc s5p_iodesc[] __initdata = {
		}, {
		.virtual = (unsigned long)S3C_VA_UART,
		.pfn = __phys_to_pfn(S3C_PA_UART),
		.length = SZ_4K,
		.length = SZ_512K,
		.type = MT_DEVICE,
		}, {
		.virtual = (unsigned long)VA_VIC0,

arch/arm/plat-s5p/include/plat/map-s5p.h

+7 −4

Original line number	Diff line number	Diff line
		@@ -18,12 +18,15 @@
		#define S5P_VA_SYSTIMER S3C_ADDR(0x01200000)
		#define S5P_VA_SROMC S3C_ADDR(0x01100000)

		#define S5P_VA_UART0 (S3C_VA_UART + 0x0)
		#define S5P_VA_UART1 (S3C_VA_UART + 0x400)
		#define S5P_VA_UART2 (S3C_VA_UART + 0x800)
		#define S5P_VA_UART3 (S3C_VA_UART + 0xC00)
		#define S5P_VA_UART(x) (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
		#define S5P_VA_UART0 S5P_VA_UART(0)
		#define S5P_VA_UART1 S5P_VA_UART(1)
		#define S5P_VA_UART2 S5P_VA_UART(2)
		#define S5P_VA_UART3 S5P_VA_UART(3)

		#ifndef S3C_UART_OFFSET
		#define S3C_UART_OFFSET (0x400)
		#endif

		#define VA_VIC(x) (S3C_VA_IRQ + ((x) * 0x10000))
		#define VA_VIC0 VA_VIC(0)

Admin message