diff options
author | R Sricharan <r.sricharan@ti.com> | 2012-06-05 06:51:32 -0400 |
---|---|---|
committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2012-07-09 09:44:39 -0400 |
commit | 05e152c76a1efaa3165afecf5acf535c8283f386 (patch) | |
tree | b8f78f3fb8612bc007855964823ddca2490911bc /arch/arm/plat-omap/include/plat | |
parent | b13e80a8bfe442406495a2fc9e7cbb79d33df48a (diff) |
ARM: OMAP5: Add minimal support for OMAP5430 SOC
OMAP5430 is Texas Instrument's SOC based on ARM Cortex-A15 SMP
architecture. It's a dual core SOC with GIC used for interrupt
handling and with an integrated L2 cache controller.
OMAP5432 is another variant of OMAP5430, with a
memory controller supporting DDR3 and SATA.
Patch includes:
- The machine specific headers and sources updates.
- Platform header updates.
- Minimum initialisation support for serial.
- IO table init
Signed-off-by: R Sricharan <r.sricharan@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm/plat-omap/include/plat')
-rw-r--r-- | arch/arm/plat-omap/include/plat/hardware.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/multi.h | 9 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/omap54xx.h | 32 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/serial.h | 10 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/uncompress.h | 6 |
5 files changed, 58 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/hardware.h b/arch/arm/plat-omap/include/plat/hardware.h index e897978371c..ddbde38e1e3 100644 --- a/arch/arm/plat-omap/include/plat/hardware.h +++ b/arch/arm/plat-omap/include/plat/hardware.h | |||
@@ -288,5 +288,6 @@ | |||
288 | #include <plat/omap44xx.h> | 288 | #include <plat/omap44xx.h> |
289 | #include <plat/ti81xx.h> | 289 | #include <plat/ti81xx.h> |
290 | #include <plat/am33xx.h> | 290 | #include <plat/am33xx.h> |
291 | #include <plat/omap54xx.h> | ||
291 | 292 | ||
292 | #endif /* __ASM_ARCH_OMAP_HARDWARE_H */ | 293 | #endif /* __ASM_ARCH_OMAP_HARDWARE_H */ |
diff --git a/arch/arm/plat-omap/include/plat/multi.h b/arch/arm/plat-omap/include/plat/multi.h index 999ffba2690..045e320f106 100644 --- a/arch/arm/plat-omap/include/plat/multi.h +++ b/arch/arm/plat-omap/include/plat/multi.h | |||
@@ -99,4 +99,13 @@ | |||
99 | # endif | 99 | # endif |
100 | #endif | 100 | #endif |
101 | 101 | ||
102 | #ifdef CONFIG_SOC_OMAP5 | ||
103 | # ifdef OMAP_NAME | ||
104 | # undef MULTI_OMAP2 | ||
105 | # define MULTI_OMAP2 | ||
106 | # else | ||
107 | # define OMAP_NAME omap5 | ||
108 | # endif | ||
109 | #endif | ||
110 | |||
102 | #endif /* __PLAT_OMAP_MULTI_H */ | 111 | #endif /* __PLAT_OMAP_MULTI_H */ |
diff --git a/arch/arm/plat-omap/include/plat/omap54xx.h b/arch/arm/plat-omap/include/plat/omap54xx.h new file mode 100644 index 00000000000..a2582bb3cab --- /dev/null +++ b/arch/arm/plat-omap/include/plat/omap54xx.h | |||
@@ -0,0 +1,32 @@ | |||
1 | /*: | ||
2 | * Address mappings and base address for OMAP5 interconnects | ||
3 | * and peripherals. | ||
4 | * | ||
5 | * Copyright (C) 2012 Texas Instruments | ||
6 | * Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
7 | * Sricharan <r.sricharan@ti.com> | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | #ifndef __ASM_SOC_OMAP54XX_H | ||
14 | #define __ASM_SOC_OMAP54XX_H | ||
15 | |||
16 | /* | ||
17 | * Please place only base defines here and put the rest in device | ||
18 | * specific headers. | ||
19 | */ | ||
20 | #define L4_54XX_BASE 0x4a000000 | ||
21 | #define L4_WK_54XX_BASE 0x4ae00000 | ||
22 | #define L4_PER_54XX_BASE 0x48000000 | ||
23 | #define L3_54XX_BASE 0x44000000 | ||
24 | #define OMAP54XX_32KSYNCT_BASE 0x4ae04000 | ||
25 | #define OMAP54XX_CM_CORE_AON_BASE 0x4a004000 | ||
26 | #define OMAP54XX_CM_CORE_BASE 0x4a008000 | ||
27 | #define OMAP54XX_PRM_BASE 0x4ae06000 | ||
28 | #define OMAP54XX_PRCM_MPU_BASE 0x48243000 | ||
29 | #define OMAP54XX_SCM_BASE 0x4a002000 | ||
30 | #define OMAP54XX_CTRL_BASE 0x4a002800 | ||
31 | |||
32 | #endif /* __ASM_SOC_OMAP555554XX_H */ | ||
diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h index 28e2d250c2f..65fce44dce3 100644 --- a/arch/arm/plat-omap/include/plat/serial.h +++ b/arch/arm/plat-omap/include/plat/serial.h | |||
@@ -63,6 +63,14 @@ | |||
63 | /* AM33XX serial port */ | 63 | /* AM33XX serial port */ |
64 | #define AM33XX_UART1_BASE 0x44E09000 | 64 | #define AM33XX_UART1_BASE 0x44E09000 |
65 | 65 | ||
66 | /* OMAP5 serial ports */ | ||
67 | #define OMAP5_UART1_BASE OMAP2_UART1_BASE | ||
68 | #define OMAP5_UART2_BASE OMAP2_UART2_BASE | ||
69 | #define OMAP5_UART3_BASE OMAP4_UART3_BASE | ||
70 | #define OMAP5_UART4_BASE OMAP4_UART4_BASE | ||
71 | #define OMAP5_UART5_BASE 0x48066000 | ||
72 | #define OMAP5_UART6_BASE 0x48068000 | ||
73 | |||
66 | /* External port on Zoom2/3 */ | 74 | /* External port on Zoom2/3 */ |
67 | #define ZOOM_UART_BASE 0x10000000 | 75 | #define ZOOM_UART_BASE 0x10000000 |
68 | #define ZOOM_UART_VIRT 0xfa400000 | 76 | #define ZOOM_UART_VIRT 0xfa400000 |
@@ -97,6 +105,8 @@ | |||
97 | #define TI81XXUART2 82 | 105 | #define TI81XXUART2 82 |
98 | #define TI81XXUART3 83 | 106 | #define TI81XXUART3 83 |
99 | #define AM33XXUART1 84 | 107 | #define AM33XXUART1 84 |
108 | #define OMAP5UART3 OMAP4UART3 | ||
109 | #define OMAP5UART4 OMAP4UART4 | ||
100 | #define ZOOM_UART 95 /* Only on zoom2/3 */ | 110 | #define ZOOM_UART 95 /* Only on zoom2/3 */ |
101 | 111 | ||
102 | /* This is only used by 8250.c for omap1510 */ | 112 | /* This is only used by 8250.c for omap1510 */ |
diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h index ac432339021..b8d19a13678 100644 --- a/arch/arm/plat-omap/include/plat/uncompress.h +++ b/arch/arm/plat-omap/include/plat/uncompress.h | |||
@@ -95,6 +95,9 @@ static inline void flush(void) | |||
95 | _DEBUG_LL_ENTRY(mach, OMAP4_UART##p##_BASE, OMAP_PORT_SHIFT, \ | 95 | _DEBUG_LL_ENTRY(mach, OMAP4_UART##p##_BASE, OMAP_PORT_SHIFT, \ |
96 | OMAP4UART##p) | 96 | OMAP4UART##p) |
97 | 97 | ||
98 | #define DEBUG_LL_OMAP5(p, mach) \ | ||
99 | _DEBUG_LL_ENTRY(mach, OMAP5_UART##p##_BASE, OMAP_PORT_SHIFT, \ | ||
100 | OMAP5UART##p) | ||
98 | /* Zoom2/3 shift is different for UART1 and external port */ | 101 | /* Zoom2/3 shift is different for UART1 and external port */ |
99 | #define DEBUG_LL_ZOOM(mach) \ | 102 | #define DEBUG_LL_ZOOM(mach) \ |
100 | _DEBUG_LL_ENTRY(mach, ZOOM_UART_BASE, ZOOM_PORT_SHIFT, ZOOM_UART) | 103 | _DEBUG_LL_ENTRY(mach, ZOOM_UART_BASE, ZOOM_PORT_SHIFT, ZOOM_UART) |
@@ -177,6 +180,9 @@ static inline void __arch_decomp_setup(unsigned long arch_id) | |||
177 | DEBUG_LL_OMAP4(3, omap_4430sdp); | 180 | DEBUG_LL_OMAP4(3, omap_4430sdp); |
178 | DEBUG_LL_OMAP4(3, omap4_panda); | 181 | DEBUG_LL_OMAP4(3, omap4_panda); |
179 | 182 | ||
183 | /* omap5 based boards using UART3 */ | ||
184 | DEBUG_LL_OMAP5(3, omap5_sevm); | ||
185 | |||
180 | /* zoom2/3 external uart */ | 186 | /* zoom2/3 external uart */ |
181 | DEBUG_LL_ZOOM(omap_zoom2); | 187 | DEBUG_LL_ZOOM(omap_zoom2); |
182 | DEBUG_LL_ZOOM(omap_zoom3); | 188 | DEBUG_LL_ZOOM(omap_zoom3); |