These patches provide support for the OMAP35x processors. This is essentially a re-submit after series of discusions earlier in the list. It had always been getting pushed in my to-do list :( See: http://marc.info/?l=linux-omap&m=122029900603111&w=2
Based on the comments received, this patch includes following: 1) Updates to Kconfig 2) Runtime check for OMAP35x 3) Updates to omap3_evm_defconfig If the changes look good, I can make updates to Beagle, Overo and Pandora boards as well. Best regards, Sanjeev Sanjeev Premi (3): Add support for OMAP35x processors Runitme check for OMAP35x Updates for OMAP3EVM arch/arm/configs/omap3_evm_defconfig | 5 ++ arch/arm/mach-omap2/Kconfig | 54 +++++++++++++++++- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/plat-omap/common.c | 68 +++++++++++++++++++++++ arch/arm/plat-omap/include/mach/common.h | 1 + arch/arm/plat-omap/include/mach/cpu.h | 88 +++++++++++++++++++++++++++++- 6 files changed, 212 insertions(+), 6 deletions(-) >From 2be5d86821dd72c90eca438dbc5a1aa7237a9ebe Mon Sep 17 00:00:00 2001 From: Sanjeev Premi <[email protected]> Date: Fri, 9 Jan 2009 20:01:10 +0530 Subject: [PATCH 1/3] Add support for OMAP35x processors This patch adds basic support for the OMAP35x Applications Processors. (See: http://focus.ti.com/general/docs/gencontent.tsp?contentId=46725) - OMAP3503 - OMAP3515 - OMAP3525 - OMAP3530 Signed-off-by: Sanjeev Premi <[email protected]> --- arch/arm/mach-omap2/Kconfig | 54 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 0a86a88..1b77b63 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -28,6 +28,54 @@ config ARCH_OMAP3430 select ARCH_OMAP_OTG select CPU_V7 +config ARCH_OMAP35XX + bool "OMAP35x Family" + select ARCH_OMAP3 + select ARCH_OMAP34XX + select ARCH_OMAP3430 + select OMAP3430_ES2 + select NEON + help + OMAP35x family of processors based on ARM Cortex-A8 + in combination with IVA2.2 core and OpenGL ES2.0 + compatible graphics engine. + + ARM Cortex-A8 contains NEON SIMD coprocessor. + +choice + prompt "Current choice" + default ARCH_OMAP3503 + +config ARCH_OMAP3503 + bool "OMAP3503" + depends on ARCH_OMAP35XX + help + Contains ARM Cortex-A8 processor. + +config ARCH_OMAP3515 + bool "OMAP3515" + depends on ARCH_OMAP35XX + help + Contains ARM Cortex-A8 processor and SGX530 subsystem + for 2D and 3D graphics acceleration. + +config ARCH_OMAP3525 + bool "OMAP3525" + depends on ARCH_OMAP35XX + help + Contains ARM Cortex-A8 processor and IVA2.2 subsystem + with a C64x+ DSP core. + +config ARCH_OMAP3530 + bool "OMAP3530" + depends on ARCH_OMAP35XX + help + Contains ARM Cortex-A8 processor, IVA2.2 subsystem + with a C64x+ DSP Core and SGX530 subsystem for 2D + and 3D graphics acceleration. + +endchoice + comment "OMAP Board Type" depends on ARCH_OMAP2 || ARCH_OMAP3 @@ -107,7 +155,7 @@ config MACH_OMAP_2430SDP config MACH_OMAP_LDP bool "OMAP3 LDP board" - depends on ARCH_OMAP3 && ARCH_OMAP34XX + depends on ARCH_OMAP3 && ARCH_OMAP34XX && !ARCH_OMAP35XX config MACH_OMAP2EVM bool "OMAP 2530 EVM board" @@ -115,11 +163,11 @@ config MACH_OMAP2EVM config MACH_OMAP_3430SDP bool "OMAP 3430 SDP board" - depends on ARCH_OMAP3 && ARCH_OMAP34XX + depends on ARCH_OMAP3 && ARCH_OMAP34XX && !ARCH_OMAP35XX config MACH_OMAP3EVM bool "OMAP 3530 EVM board" - depends on ARCH_OMAP3 && ARCH_OMAP34XX + depends on ARCH_OMAP35XX config MACH_OMAP3_BEAGLE bool "OMAP3 BEAGLE board" -- 1.5.6 >From bb61b0c052c8dcf164a98894d2728e40f1242ea2 Mon Sep 17 00:00:00 2001 From: Sanjeev Premi <[email protected]> Date: Fri, 9 Jan 2009 20:10:20 +0530 Subject: [PATCH 2/3] Runitme check for OMAP35x Added runtime check via omap2_set_globals_35xx() Signed-off-by: Sanjeev Premi <[email protected]> --- arch/arm/plat-omap/common.c | 68 +++++++++++++++++++++++ arch/arm/plat-omap/include/mach/common.h | 1 + arch/arm/plat-omap/include/mach/cpu.h | 88 +++++++++++++++++++++++++++++- 3 files changed, 155 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 8c53125..7861a25 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -333,3 +333,71 @@ void __init omap2_set_globals_343x(void) } #endif +#if defined(CONFIG_ARCH_OMAP35XX) + +#if defined(CONFIG_ARCH_OMAP3503) +static struct omap_globals omap3503_globals = { + .class = OMAP35XX_CLASS, + .tap = OMAP2_IO_ADDRESS(0x4830A000), + .sdrc = OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE), + .sms = OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE), + .ctrl = OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE), + .prm = OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE), + .cm = OMAP2_IO_ADDRESS(OMAP3430_CM_BASE), +}; +#endif /* if defined(CONFIG_ARCH_OMAP3503) */ + +#if defined(CONFIG_ARCH_OMAP3515) +static struct omap_globals omap3515_globals = { + .class = OMAP35XX_CLASS, + .tap = OMAP2_IO_ADDRESS(0x4830A000), + .sdrc = OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE), + .sms = OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE), + .ctrl = OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE), + .prm = OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE), + .cm = OMAP2_IO_ADDRESS(OMAP3430_CM_BASE), +}; +#endif /* if defined(CONFIG_ARCH_OMAP3515) */ + +#if defined(CONFIG_ARCH_OMAP3525) +static struct omap_globals omap3525_globals = { + .class = OMAP35XX_CLASS, + .tap = OMAP2_IO_ADDRESS(0x4830A000), + .sdrc = OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE), + .sms = OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE), + .ctrl = OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE), + .prm = OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE), + .cm = OMAP2_IO_ADDRESS(OMAP3430_CM_BASE), +}; +#endif /* if defined(CONFIG_ARCH_OMAP3525) */ + +#if defined(CONFIG_ARCH_OMAP3530) +static struct omap_globals omap3530_globals = { + .class = OMAP35XX_CLASS, + .tap = OMAP2_IO_ADDRESS(0x4830A000), + .sdrc = OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE), + .sms = OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE), + .ctrl = OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE), + .prm = OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE), + .cm = OMAP2_IO_ADDRESS(OMAP3430_CM_BASE), +}; +#endif /* if defined(CONFIG_ARCH_OMAP3530) */ + +void __init omap2_set_globals_35xx(void) +{ +#if defined(CONFIG_ARCH_OMAP3503) + omap2_globals = &omap3503_globals; +#endif +#if defined(CONFIG_ARCH_OMAP3515) + omap2_globals = &omap3515_globals; +#endif +#if defined(CONFIG_ARCH_OMAP3525) + omap2_globals = &omap3525_globals; +#endif +#if defined(CONFIG_ARCH_OMAP3530) + omap2_globals = &omap3530_globals; +#endif + + __omap2_set_globals(); +} +#endif /* if defined(CONFIG_ARCH_OMAP35XX) */ diff --git a/arch/arm/plat-omap/include/mach/common.h b/arch/arm/plat-omap/include/mach/common.h index af4105f..f41cba2 100644 --- a/arch/arm/plat-omap/include/mach/common.h +++ b/arch/arm/plat-omap/include/mach/common.h @@ -60,6 +60,7 @@ struct omap_globals { void omap2_set_globals_242x(void); void omap2_set_globals_243x(void); void omap2_set_globals_343x(void); +void omap2_set_globals_35xx(void); /* These get called from omap2_set_globals_xxxx(), do not call these */ void omap2_set_globals_tap(struct omap_globals *); diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h index b2062f1..f583042 100644 --- a/arch/arm/plat-omap/include/mach/cpu.h +++ b/arch/arm/plat-omap/include/mach/cpu.h @@ -93,7 +93,7 @@ unsigned int omap_rev(void); # define OMAP_NAME omap2430 # endif #endif -#ifdef CONFIG_ARCH_OMAP3430 +#if defined(CONFIG_ARCH_OMAP3430) && !defined(CONFIG_ARCH_OMAP35XX) # ifdef OMAP_NAME # undef MULTI_OMAP2 # define MULTI_OMAP2 @@ -102,6 +102,46 @@ unsigned int omap_rev(void); # endif #endif +#ifdef CONFIG_ARCH_OMAP35XX +# ifdef CONFIG_ARCH_OMAP3503 +# ifdef OMAP_NAME +# undef MULTI_OMAP2 +# define MULTI_OMAP2 +# else +# define OMAP_NAME omap3503 +# endif +# endif /* ifdef CONFIG_ARCH_OMAP3503 */ + +# ifdef CONFIG_ARCH_OMAP3515 +# ifdef OMAP_NAME +# undef MULTI_OMAP2 +# define MULTI_OMAP2 +# else +# define OMAP_NAME omap3515 +# endif +# endif /* ifdef CONFIG_ARCH_OMAP3515 */ + +# ifdef CONFIG_ARCH_OMAP3525 +# ifdef OMAP_NAME +# undef MULTI_OMAP2 +# define MULTI_OMAP2 +# else +# define OMAP_NAME omap3525 +# endif +# endif /* ifdef CONFIG_ARCH_OMAP3525 */ + +# ifdef CONFIG_ARCH_OMAP3530 +# ifdef OMAP_NAME +# undef MULTI_OMAP2 +# define MULTI_OMAP2 +# else +# define OMAP_NAME omap3530 +# endif +# endif /* ifdef CONFIG_ARCH_OMAP3530 */ + +#endif /* ifdef CONFIG_ARCH_OMAP35XX */ + + /* * Macros to group OMAP into cpu classes. * These can be used in most places. @@ -112,6 +152,7 @@ unsigned int omap_rev(void); * cpu_is_omap242x(): True for OMAP2420, OMAP2422, OMAP2423 * cpu_is_omap243x(): True for OMAP2430 * cpu_is_omap343x(): True for OMAP3430 + * cpu_is_omap35xx(): True for OMAP35XX */ #define GET_OMAP_CLASS (omap_rev() & 0xff) @@ -147,6 +188,7 @@ IS_OMAP_SUBCLASS(343x, 0x343) #define cpu_is_omap243x() 0 #define cpu_is_omap34xx() 0 #define cpu_is_omap343x() 0 +#define cpu_is_omap35xx() 0 #if defined(MULTI_OMAP1) # if defined(CONFIG_ARCH_OMAP730) @@ -191,6 +233,10 @@ IS_OMAP_SUBCLASS(343x, 0x343) # define cpu_is_omap34xx() is_omap34xx() # define cpu_is_omap343x() is_omap343x() # endif +# if defined(CONFIG_ARCH_OMAP35XX) +# undef cpu_is_omap35xx +# define cpu_is_omap35xx() is_omap35xx() +# endif #else # if defined(CONFIG_ARCH_OMAP24XX) # undef cpu_is_omap24xx @@ -212,6 +258,10 @@ IS_OMAP_SUBCLASS(343x, 0x343) # undef cpu_is_omap343x # define cpu_is_omap343x() 1 # endif +# if defined(CONFIG_ARCH_OMAP35XX) +# undef cpu_is_omap35xx +# define cpu_is_omap35xx() 1 +# endif #endif /* @@ -230,7 +280,11 @@ IS_OMAP_SUBCLASS(343x, 0x343) * cpu_is_omap2423(): True for OMAP2423 * cpu_is_omap2430(): True for OMAP2430 * cpu_is_omap3430(): True for OMAP3430 - */ + * cpu_is_omap3503(): True for OMAP3503 + * cpu_is_omap3515(): True for OMAP3515 + * cpu_is_omap3525(): True for OMAP3525 + * cpu_is_omap3530(): True for OMAP3530 + */; #define GET_OMAP_TYPE ((omap_rev() >> 16) & 0xffff) #define IS_OMAP_TYPE(type, id) \ @@ -252,6 +306,10 @@ IS_OMAP_TYPE(2422, 0x2422) IS_OMAP_TYPE(2423, 0x2423) IS_OMAP_TYPE(2430, 0x2430) IS_OMAP_TYPE(3430, 0x3430) +IS_OMAP_TYPE(3503, 0x3430) +IS_OMAP_TYPE(3515, 0x3430) +IS_OMAP_TYPE(3525, 0x3430) +IS_OMAP_TYPE(3530, 0x3430) #define cpu_is_omap310() 0 #define cpu_is_omap730() 0 @@ -266,6 +324,10 @@ IS_OMAP_TYPE(3430, 0x3430) #define cpu_is_omap2423() 0 #define cpu_is_omap2430() 0 #define cpu_is_omap3430() 0 +#define cpu_is_omap3503() 0 +#define cpu_is_omap3515() 0 +#define cpu_is_omap3525() 0 +#define cpu_is_omap3530() 0 #if defined(MULTI_OMAP1) # if defined(CONFIG_ARCH_OMAP730) @@ -319,6 +381,26 @@ IS_OMAP_TYPE(3430, 0x3430) # define cpu_is_omap3430() is_omap3430() #endif +#if defined(CONFIG_ARCH_OMAP35XX) +# undef cpu_is_omap3503 +# undef cpu_is_omap3515 +# undef cpu_is_omap3525 +# undef cpu_is_omap3530 + +# if defined(CONFIG_ARCH_OMAP3503) +# define cpu_is_omap3503() 1 +# endif +# if defined(CONFIG_ARCH_OMAP3515) +# define cpu_is_omap3515() 1 +# endif +# if defined(CONFIG_ARCH_OMAP3525) +# define cpu_is_omap3525() 1 +# endif +# if defined(CONFIG_ARCH_OMAP3525) +# define cpu_is_omap3530() 1 +# endif +#endif /* if defined(CONFIG_ARCH_OMAP35XX) */ + /* Macros to detect if we have OMAP1 or OMAP2 */ #define cpu_class_is_omap1() (cpu_is_omap730() || cpu_is_omap15xx() || \ cpu_is_omap16xx()) @@ -340,6 +422,8 @@ IS_OMAP_TYPE(3430, 0x3430) #define OMAP3430_REV_ES2_1 0x34302034 #define OMAP3430_REV_ES3_0 0x34303034 +#define OMAP35XX_CLASS 0x34300000 + /* * omap_chip bits * -- 1.5.6 >From 140183aa07070a01f1f35d5d280cec922bfa5e44 Mon Sep 17 00:00:00 2001 From: Sanjeev Premi <[email protected]> Date: Fri, 9 Jan 2009 20:13:50 +0530 Subject: [PATCH 3/3] Updates for OMAP3EVM Includes: - Updates to default board configuration. - Call function omap2_set_globals_35xx() Signed-off-by: Sanjeev Premi <[email protected]> --- arch/arm/configs/omap3_evm_defconfig | 5 +++++ arch/arm/mach-omap2/board-omap3evm.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig index e42fe8c..deb148d 100644 --- a/arch/arm/configs/omap3_evm_defconfig +++ b/arch/arm/configs/omap3_evm_defconfig @@ -206,6 +206,11 @@ CONFIG_OMAP_LL_DEBUG_UART1=y CONFIG_OMAP_SERIAL_WAKE=y CONFIG_ARCH_OMAP34XX=y CONFIG_ARCH_OMAP3430=y +CONFIG_ARCH_OMAP35XX=y +CONFIG_ARCH_OMAP3503=y +# CONFIG_ARCH_OMAP3515 is not set +# CONFIG_ARCH_OMAP3525 is not set +# CONFIG_ARCH_OMAP3530 is not set # # OMAP Board Type diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index e4e60e2..7fb3eef 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -264,7 +264,7 @@ static void __init omap3_evm_init(void) static void __init omap3_evm_map_io(void) { - omap2_set_globals_343x(); + omap2_set_globals_35xx(); omap2_map_common_io(); } -- 1.5.6 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
