aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-01-27 16:57:07 +0900
committerBen Dooks <ben-linux@fluff.org>2010-01-27 17:43:07 +0900
commit81317960466ebd37fd958aa07993e3fea461dbe4 (patch)
treee3bfbebd233b69d426352eb7d3dc758be3997ff7 /arch
parente96b234b7e9d24e50528287b881ca229b7f094b8 (diff)
downloadmrst-s0i3-test-81317960466ebd37fd958aa07993e3fea461dbe4.tar.gz
mrst-s0i3-test-81317960466ebd37fd958aa07993e3fea461dbe4.tar.xz
mrst-s0i3-test-81317960466ebd37fd958aa07993e3fea461dbe4.zip
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: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s5p6440/include/mach/debug-macro.S4
-rw-r--r--arch/arm/mach-s5p6440/include/mach/map.h65
-rw-r--r--arch/arm/mach-s5p6440/include/mach/regs-clock.h2
-rw-r--r--arch/arm/mach-s5p6440/include/mach/tick.h2
-rw-r--r--arch/arm/mach-s5p6440/mach-smdk6440.c4
-rw-r--r--arch/arm/plat-s5p/cpu.c19
-rw-r--r--arch/arm/plat-s5p/include/plat/irqs.h2
-rw-r--r--arch/arm/plat-s5p/include/plat/map-s5p.h32
-rw-r--r--arch/arm/plat-s5p/irq.c5
9 files changed, 65 insertions, 70 deletions
diff --git a/arch/arm/mach-s5p6440/include/mach/debug-macro.S b/arch/arm/mach-s5p6440/include/mach/debug-macro.S
index f3a5d1635be..48cdb0da026 100644
--- a/arch/arm/mach-s5p6440/include/mach/debug-macro.S
+++ b/arch/arm/mach-s5p6440/include/mach/debug-macro.S
@@ -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
diff --git a/arch/arm/mach-s5p6440/include/mach/map.h b/arch/arm/mach-s5p6440/include/mach/map.h
index 4a73e73c942..8924e5a4d6a 100644
--- a/arch/arm/mach-s5p6440/include/mach/map.h
+++ b/arch/arm/mach-s5p6440/include/mach/map.h
@@ -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 */
diff --git a/arch/arm/mach-s5p6440/include/mach/regs-clock.h b/arch/arm/mach-s5p6440/include/mach/regs-clock.h
index b7af28342bc..c783ecc9f19 100644
--- a/arch/arm/mach-s5p6440/include/mach/regs-clock.h
+++ b/arch/arm/mach-s5p6440/include/mach/regs-clock.h
@@ -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)
diff --git a/arch/arm/mach-s5p6440/include/mach/tick.h b/arch/arm/mach-s5p6440/include/mach/tick.h
index 0815aeb4f2c..2f25c7f0797 100644
--- a/arch/arm/mach-s5p6440/include/mach/tick.h
+++ b/arch/arm/mach-s5p6440/include/mach/tick.h
@@ -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)));
}
diff --git a/arch/arm/mach-s5p6440/mach-smdk6440.c b/arch/arm/mach-s5p6440/mach-smdk6440.c
index 760ea5424a7..3ae88f2c7c7 100644
--- a/arch/arm/mach-s5p6440/mach-smdk6440.c
+++ b/arch/arm/mach-s5p6440/mach-smdk6440.c
@@ -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,
diff --git a/arch/arm/plat-s5p/cpu.c b/arch/arm/plat-s5p/cpu.c
index 0895a77a283..ee9c6b302de 100644
--- a/arch/arm/plat-s5p/cpu.c
+++ b/arch/arm/plat-s5p/cpu.c
@@ -37,31 +37,34 @@ static struct cpu_table cpu_ids[] __initdata = {
/* minimal IO mapping */
-#define UART_OFFS (S5P_PA_UART & 0xfffff)
-
static struct map_desc s5p_iodesc[] __initdata = {
{
- .virtual = (unsigned long)S5P_VA_SYSCON,
+ .virtual = (unsigned long)S5P_VA_CHIPID,
+ .pfn = __phys_to_pfn(S5P_PA_CHIPID),
+ .length = SZ_4K,
+ .type = MT_DEVICE,
+ }, {
+ .virtual = (unsigned long)S3C_VA_SYS,
.pfn = __phys_to_pfn(S5P_PA_SYSCON),
.length = SZ_64K,
.type = MT_DEVICE,
}, {
- .virtual = (unsigned long)(S5P_VA_UART + UART_OFFS),
- .pfn = __phys_to_pfn(S5P_PA_UART),
+ .virtual = (unsigned long)S3C_VA_UART,
+ .pfn = __phys_to_pfn(S3C_PA_UART),
.length = SZ_4K,
.type = MT_DEVICE,
}, {
- .virtual = (unsigned long)S5P_VA_VIC0,
+ .virtual = (unsigned long)VA_VIC0,
.pfn = __phys_to_pfn(S5P_PA_VIC0),
.length = SZ_16K,
.type = MT_DEVICE,
}, {
- .virtual = (unsigned long)S5P_VA_VIC1,
+ .virtual = (unsigned long)VA_VIC1,
.pfn = __phys_to_pfn(S5P_PA_VIC1),
.length = SZ_16K,
.type = MT_DEVICE,
}, {
- .virtual = (unsigned long)S5P_VA_TIMER,
+ .virtual = (unsigned long)S3C_VA_TIMER,
.pfn = __phys_to_pfn(S5P_PA_TIMER),
.length = SZ_16K,
.type = MT_DEVICE,
diff --git a/arch/arm/plat-s5p/include/plat/irqs.h b/arch/arm/plat-s5p/include/plat/irqs.h
index 5d7937dddad..878acfe3690 100644
--- a/arch/arm/plat-s5p/include/plat/irqs.h
+++ b/arch/arm/plat-s5p/include/plat/irqs.h
@@ -29,6 +29,8 @@
#define S5P_VIC0_BASE S5P_IRQ(0)
#define S5P_VIC1_BASE S5P_IRQ(32)
+#define VIC_BASE(x) (S5P_VIC0_BASE + ((x)*32))
+
#define IRQ_VIC0_BASE S5P_VIC0_BASE
#define IRQ_VIC1_BASE S5P_VIC1_BASE
diff --git a/arch/arm/plat-s5p/include/plat/map-s5p.h b/arch/arm/plat-s5p/include/plat/map-s5p.h
new file mode 100644
index 00000000000..51d9cb5a3e2
--- /dev/null
+++ b/arch/arm/plat-s5p/include/plat/map-s5p.h
@@ -0,0 +1,32 @@
+/* linux/arch/arm/plat-s5p/include/plat/map-s5p.h
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * http://www.samsung.com/
+ *
+ * S5P - Memory map definitions
+ *
+ * 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
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __ASM_PLAT_MAP_S5P_H
+#define __ASM_PLAT_MAP_S5P_H __FILE__
+
+#define S5P_VA_CHIPID S3C_ADDR(0x00700000)
+#define S5P_VA_GPIO S3C_ADDR(0x00500000)
+#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 S3C_UART_OFFSET (0x400)
+
+#define VA_VIC(x) (S3C_VA_IRQ + ((x) * 0x10000))
+#define VA_VIC0 VA_VIC(0)
+#define VA_VIC1 VA_VIC(1)
+
+#endif /* __ASM_PLAT_MAP_S5P_H */
diff --git a/arch/arm/plat-s5p/irq.c b/arch/arm/plat-s5p/irq.c
index eada40d0847..11535a5f534 100644
--- a/arch/arm/plat-s5p/irq.c
+++ b/arch/arm/plat-s5p/irq.c
@@ -25,9 +25,6 @@
#include <plat/irq-vic-timer.h>
#include <plat/irq-uart.h>
-#define VIC_VAADDR(no) (S5P_VA_VIC0 + ((no)*0x10000))
-#define VIC_BASE(no) (S5P_VIC0_BASE + ((no)*32))
-
/*
* Note, we make use of the fact that the parent IRQs, IRQ_UART[0..3]
* are consecutive when looking up the interrupt in the demux routines.
@@ -61,7 +58,7 @@ void __init s5p_init_irq(u32 *vic, u32 num_vic)
/* initialize the VICs */
for (irq = 0; irq < num_vic; irq++)
- vic_init(VIC_VAADDR(irq), VIC_BASE(irq), vic[irq], 0);
+ vic_init(VA_VIC(irq), VIC_BASE(irq), vic[irq], 0);
s3c_init_vic_timer_irq(IRQ_TIMER0_VIC, IRQ_TIMER0);
s3c_init_vic_timer_irq(IRQ_TIMER1_VIC, IRQ_TIMER1);