OMAP4: Create architecture macros and config entries.
Subsystems (6)
RFC PATCH 1/7 OMAP4: Create architecture macros and config entries.
This patch creates the architectural macros for OMAP4. The MULTI_OMAP build is not yet supported by OMAP4.
--- arch/arm/mach-omap2/Kconfig | 16 +++++++++++++++- arch/arm/plat-omap/Kconfig | 10 +++++++--- arch/arm/plat-omap/include/mach/cpu.h | 17 +++++++++++++++-- 3 files changed, 37 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/Kconfig +15 -1
@@ -24,8 +24,18 @@ config ARCH_OMAP3430 depends on ARCH_OMAP3 && ARCH_OMAP34XX select ARCH_OMAP_OTG +config ARCH_OMAP44XX + bool "OMAP44xx Based System" + depends on ARCH_OMAP4 + +config ARCH_OMAP4430 + bool "OMAP4430 support" + depends on ARCH_OMAP4 && ARCH_OMAP44XX + select ARM_GIC + + comment "OMAP Board Type" - depends on ARCH_OMAP2 || ARCH_OMAP3 + depends on ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4 config MACH_OMAP_GENERIC bool "Generic OMAP board"
@@ -67,3 +77,7 @@ config MACH_OMAP_3430SDP config MACH_NOKIA_RX51 bool "Nokia RX-51 board" depends on ARCH_OMAP3 && ARCH_OMAP34XX + +config MACH_OMAP_4430SDP + bool "OMAP 4430 SDP board" + depends on ARCH_OMAP4 && ARCH_OMAP44XX
arch/arm/plat-omap/Kconfig +7 -3
@@ -23,6 +23,10 @@ config ARCH_OMAP3 select CPU_V7 select COMMON_CLKDEV +config ARCH_OMAP4 + bool "TI OMAP4" + select CPU_V7 + endchoice comment "OMAP Feature Selections"
@@ -128,13 +132,13 @@ config OMAP_MPU_TIMER config OMAP_32K_TIMER bool "Use 32KHz timer" - depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX + depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP44XX help Select this option if you want to enable the OMAP 32KHz timer. This timer saves power compared to the OMAP_MPU_TIMER, and has support for no tick during idle. The 32KHz timer provides less intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is - currently only available for OMAP16XX, 24XX and 34XX. + currently only available for OMAP16XX, 24XX, 34XX and 44XX. endchoice
@@ -149,7 +153,7 @@ config OMAP_32K_TIMER_HZ config OMAP_DM_TIMER bool "Use dual-mode timer" - depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX + depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP44XX help Select this option if you want to use OMAP Dual-Mode timers.
arch/arm/plat-omap/include/mach/cpu.h +15 -2
@@ -155,6 +155,8 @@ IS_OMAP_SUBCLASS(343x, 0x343)#define cpu_is_omap243x () 0#define cpu_is_omap34xx () 0#define cpu_is_omap343x () 0 +#define cpu_is_omap44xx () 0 +#define cpu_is_omap443x () 0#if defined(MULTI_OMAP1 )# if defined(CONFIG_ARCH_OMAP730 )
@@ -348,12 +350,21 @@ IS_OMAP_TYPE(3430, 0x3430)# define cpu_is_omap3430 () is_omap3430()#endif +# if defined(CONFIG_ARCH_OMAP44XX ) +# undef cpu_is_omap44xx +# undef cpu_is_omap443x +# define cpu_is_omap44xx () 1 +# define cpu_is_omap443x () 1 +# endif +/* Macros to detect if we have OMAP1 or OMAP2 */ #define cpu_class_is_omap1 () (cpu_is_omap7xx() || cpu_is_omap15xx() || \ cpu_is_omap16xx()) -#define cpu_class_is_omap2 () (cpu_is_omap24xx() || cpu_is_omap34xx()) +#define cpu_class_is_omap2 () (cpu_is_omap24xx() || cpu_is_omap34xx() || \ + cpu_is_omap44xx()) -#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )/* Various silicon revisions for omap2 */ #define OMAP242X_CLASS 0x24200024
@@ -370,6 +381,8 @@ IS_OMAP_TYPE(3430, 0x3430)#define OMAP3430_REV_ES3_0 0x34303034#define OMAP3430_REV_ES3_1 0x34304034 +#define OMAP443X_CLASS 0x44300034 +/* * omap_chip bits *
Signature · 1 line
1.5.4.7
RFC PATCH 2/7 OMAP4: Create board support for OMAP_4430SDP.
This patch creates the bare minimal board files to support OMAP_4430SDP. Additinaly new omap44xx.h is created which contains the base addresses for OMAP4430.File omap34xx.h is adapted to avoid multiple definitions of common omap base address definitions.
--- arch/arm/mach-omap2/board-4430sdp.c | 91 +++++++++++++++++++++++ arch/arm/plat-omap/include/mach/board-4430sdp.h | 28 +++++++ arch/arm/plat-omap/include/mach/hardware.h | 1 + arch/arm/plat-omap/include/mach/omap34xx.h | 8 +- arch/arm/plat-omap/include/mach/omap44xx.h | 61 +++++++++++++++ 5 files changed, 185 insertions(+), 4 deletions(-) create mode 100644 arch/arm/mach-omap2/board-4430sdp.c create mode 100644 arch/arm/plat-omap/include/mach/board-4430sdp.h create mode 100644 arch/arm/plat-omap/include/mach/omap44xx.h
arch/arm/mach-omap2/board-4430sdp.c new file +91 -0
@@ -0,0 +1,91 @@ +/* +* Board support file for OMAP4430 SDP. +* +* Copyright (C) 2009 Texas Instruments +* +* Author: Santosh Shilimkar <[email protected]> +* +* Based on mach-omap2/board-3430sdp.c +* +* 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. +*/ + +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/platform_device.h> +#include <linux/io.h> + +#include <mach/hardware.h> +#include <asm/mach-types.h> +#include <asm/mach/arch.h> +#include <asm/mach/map.h> + +#include <mach/gpio.h> +#include <mach/board.h> +#include <mach/common.h> +#include <mach/control.h> +#include <asm/hardware/gic.h> + +static struct platform_device sdp4430_lcd_device = { + .name ="sdp4430_lcd" , + .id =-1 , +}; + +static struct platform_device *sdp4430_devices[]__initdata = { + &sdp4430_lcd_device, +}; + +static struct omap_uart_config sdp4430_uart_config__initdata = { + .enabled_uarts = ((1 <<0 ) | (1 <<1 ) | (1 <<2 )), +}; + +static struct omap_lcd_config sdp4430_lcd_config__initdata = { + .ctrl_name ="internal" , +}; + +static struct omap_board_config_kernel sdp4430_config[]__initdata = { + {OMAP_TAG_UART , &sdp4430_uart_config }, + {OMAP_TAG_LCD , &sdp4430_lcd_config }, +}; + +static void __init gic_init_irq (void ) +{ +gic_dist_init (0 ,IO_ADDRESS (OMAP44XX_GIC_DIST_BASE ),29 ); +gic_cpu_init (0 ,IO_ADDRESS (OMAP44XX_GIC_CPU_BASE )); +} + +static void __init omap_4430sdp_init_irq (void ) +{ +omap2_init_common_hw (NULL ); +gic_init_irq (); +omap_gpio_init (); +} + + +static void __init omap_4430sdp_init (void ) +{ +platform_add_devices (sdp4430_devices,ARRAY_SIZE (sdp4430_devices)); + omap_board_config = sdp4430_config; + omap_board_config_size =ARRAY_SIZE (sdp4430_config); +omap_serial_init (); + +} + +static void __init omap_4430sdp_map_io (void ) +{ +omap2_set_globals_443x (); +omap2_map_common_io (); +} + +MACHINE_START (OMAP_4430SDP ,"OMAP4430 4430SDP board" ) +/* Maintainer: Santosh Shilimkar - Texas Instruments Inc */ + .phys_io = 0x48000000, + .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, + .boot_params = 0x80000100, + .map_io = omap_4430sdp_map_io, + .init_irq = omap_4430sdp_init_irq, + .init_machine = omap_4430sdp_init, + .timer = &omap_timer, +MACHINE_END
arch/arm/plat-omap/include/mach/board-4430sdp.h new file +28 -0
@@ -0,0 +1,28 @@ +/* +* Board support header for OMAP4430 SDP. +* +* Copyright (C) 2009 Texas Instruments +* +* Author: Santosh Shilimkar <[email protected]> +* +* Based on arch/arm/plat-omap/include/mach/board-3430sdp.h +* +* 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 __ARCH_ARM_MACH_OMAP4_BOARD_4430SDP_H +#define __ARCH_ARM_MACH_OMAP4_BOARD_4430SDP_H + +extern void sdp4430_flash_init (void ); + +/* NAND */ +#define DEBUG_BASE 0x08000000/* debug board */ +#define NAND_BASE 0x0C000000/* NAND flash */ +#define ONENAND_MAP 0x20000000/* OneNand flash */ + +/* various memory sizes */ +#define FLASH_SIZE_SDPV1 SZ_64M +#define FLASH_SIZE_SDPV2 SZ_128M +#endif +
arch/arm/plat-omap/include/mach/hardware.h +1 -0
@@ -285,5 +285,6 @@#include "omap16xx.h" #include "omap24xx.h" #include "omap34xx.h" +#include "omap44xx.h" #endif /* __ASM_ARCH_OMAP_HARDWARE_H */
arch/arm/plat-omap/include/mach/omap34xx.h +4 -4
@@ -31,13 +31,9 @@#define L4_34XX_BASE 0x48000000#define L4_WK_34XX_BASE 0x48300000 -#define L4_WK_OMAP_BASE L4_WK_34XX_BASE#define L4_PER_34XX_BASE 0x49000000 -#define L4_PER_OMAP_BASE L4_PER_34XX_BASE#define L4_EMU_34XX_BASE 0x54000000 -#define L4_EMU_BASE L4_EMU_34XX_BASE#define L3_34XX_BASE 0x68000000 -#define L3_OMAP_BASE L3_34XX_BASE#define OMAP3430_32KSYNCT_BASE 0x48320000#define OMAP3430_CM_BASE 0x48004800
@@ -85,6 +81,10 @@#if defined(CONFIG_ARCH_OMAP3430 ) +#define L4_WK_OMAP_BASE L4_WK_34XX_BASE +#define L4_PER_OMAP_BASE L4_PER_34XX_BASE +#define L4_EMU_BASE L4_EMU_34XX_BASE +#define L3_OMAP_BASE L3_34XX_BASE#define OMAP2_32KSYNCT_BASE OMAP3430_32KSYNCT_BASE#define OMAP2_CM_BASE OMAP3430_CM_BASE#define OMAP2_PRM_BASE OMAP3430_PRM_BASE
arch/arm/plat-omap/include/mach/omap44xx.h new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
1.5.4.7
RFC PATCH 3/7 OMAP4: Update common omap platform headers.
This patch updates the common platform headers files for OMAP4430. On OMAP4, GIC is used instead of INTC, hence all the private peripheral interrupts are shifted by an offset of 32. So if the hardcoding is not done for IRQ lines in drivers, then this change won't impact any driver.
--- arch/arm/plat-omap/include/mach/common.h | 1 + arch/arm/plat-omap/include/mach/control.h | 3 +- arch/arm/plat-omap/include/mach/debug-macro.S | 2 +- arch/arm/plat-omap/include/mach/dma.h | 1 + arch/arm/plat-omap/include/mach/entry-macro.S | 45 +++++- arch/arm/plat-omap/include/mach/io.h | 34 ++++ arch/arm/plat-omap/include/mach/irqs.h | 205 +++++++++++++------------ arch/arm/plat-omap/include/mach/memory.h | 3 +- arch/arm/plat-omap/include/mach/serial.h | 11 ++- arch/arm/plat-omap/include/mach/system.h | 7 + 10 files changed, 206 insertions(+), 106 deletions(-)
arch/arm/plat-omap/include/mach/common.h +1 -0
@@ -62,6 +62,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_443x (void );/* These get called from omap2_set_globals_xxxx(), do not call these */ void omap2_set_globals_tap (struct omap_globals *);
arch/arm/plat-omap/include/mach/control.h +2 -1
@@ -190,7 +190,8 @@#define OMAP2_PBIASLITEVMODE0 (1 << 0)#ifndef __ASSEMBLY__ -#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )extern void __iomem *omap_ctrl_base_get (void );extern u8 omap_ctrl_readb (u16 offset);extern u16 omap_ctrl_readw (u16 offset);
arch/arm/plat-omap/include/mach/debug-macro.S +1 -1
@@ -36,7 +36,7 @@ add \rx, \rx, #0x00004000 @ UART 3 #endif -#elif CONFIG_ARCH_OMAP3 +#elif (CONFIG_ARCH_OMAP3 || CONFIG_ARCH_OMAP4) moveq \rx, #0x48000000 @ physical base address movne \rx, #0xd8000000 @ virtual base orr \rx, \rx, #0x0006a000
arch/arm/plat-omap/include/mach/dma.h +1 -0
@@ -48,6 +48,7 @@/* Hardware registers for omap2 and omap3 */ #define OMAP24XX_DMA4_BASE (L4_24XX_BASE + 0x56000)#define OMAP34XX_DMA4_BASE (L4_34XX_BASE + 0x56000) +#define OMAP44XX_DMA4_BASE (L4_44XX_BASE + 0x56000)#define OMAP_DMA4_REVISION 0x00#define OMAP_DMA4_GCR 0x78
arch/arm/plat-omap/include/mach/entry-macro.S +43 -2
75 lines not on this page · raw message
arch/arm/plat-omap/include/mach/io.h +34 -0
@@ -157,6 +157,40 @@#define DSP_MMU_34XX_VIRT 0xe2000000#define DSP_MMU_34XX_SIZE SZ_4K + +#elif defined(CONFIG_ARCH_OMAP4 ) +/* We map both L3 and L4 on OMAP4 */ +#define L3_44XX_PHYS L3_44XX_BASE +#define L3_44XX_VIRT 0xd4000000 +#define L3_44XX_SIZE SZ_1M + +#define L4_44XX_PHYS L4_44XX_BASE +#define L4_44XX_VIRT 0xda000000 +#define L4_44XX_SIZE SZ_4M + + +#define L4_WK_44XX_PHYS L4_WK_44XX_BASE +#define L4_WK_44XX_VIRT 0xda300000 +#define L4_WK_44XX_SIZE SZ_1M + +#define L4_PER_44XX_PHYS L4_PER_44XX_BASE +#define L4_PER_44XX_VIRT 0xd8000000 +#define L4_PER_44XX_SIZE SZ_4M + +#define L4_EMU_44XX_PHYS L4_EMU_44XX_BASE +#define L4_EMU_44XX_VIRT 0xe4000000 +#define L4_EMU_44XX_SIZE SZ_64M + +#define OMAP44XX_GPMC_PHYS OMAP44XX_GPMC_BASE +#define OMAP44XX_GPMC_VIRT 0xe0000000 +#define OMAP44XX_GPMC_SIZE SZ_1M + + +#define IO_OFFSET 0x90000000 +#define __IO_ADDRESS (pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ +#define __OMAP2_IO_ADDRESS (pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ +#define io_v2p (va) ((va) - IO_OFFSET)/* Works for L3 and L4 */ +#endif #define IO_ADDRESS (pa) IOMEM(__IO_ADDRESS(pa))
arch/arm/plat-omap/include/mach/irqs.h +105 -100
214 lines not on this page · raw message
arch/arm/plat-omap/include/mach/memory.h +2 -1
@@ -38,7 +38,8 @@*/ #if defined(CONFIG_ARCH_OMAP1 )#define PHYS_OFFSET UL(0x10000000) -#elif defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#elif defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )#define PHYS_OFFSET UL(0x80000000)#endif
arch/arm/plat-omap/include/mach/serial.h +10 -1
@@ -15,19 +15,28 @@#define OMAP_UART1_BASE 0xfffb0000#define OMAP_UART2_BASE 0xfffb0800#define OMAP_UART3_BASE 0xfffb9800 +#define OMAP_MAX_NR_PORTS 3#elif defined(CONFIG_ARCH_OMAP2 )/* OMAP2 serial ports */ #define OMAP_UART1_BASE 0x4806a000#define OMAP_UART2_BASE 0x4806c000#define OMAP_UART3_BASE 0x4806e000 +#define OMAP_MAX_NR_PORTS 3#elif defined(CONFIG_ARCH_OMAP3 )/* OMAP3 serial ports */ #define OMAP_UART1_BASE 0x4806a000#define OMAP_UART2_BASE 0x4806c000#define OMAP_UART3_BASE 0x49020000 +#define OMAP_MAX_NR_PORTS 3 +#elif defined(CONFIG_ARCH_OMAP4 ) +/* OMAP4 serial ports */ +#define OMAP_UART1_BASE 0x4806a000 +#define OMAP_UART2_BASE 0x4806c000 +#define OMAP_UART3_BASE 0x48020000 +#define OMAP_UART4_BASE 0x4806e000 +#define OMAP_MAX_NR_PORTS 4#endif -#define OMAP_MAX_NR_PORTS 3#define OMAP1510_BASE_BAUD (12000000/16)#define OMAP16XX_BASE_BAUD (48000000/16)#define OMAP24XX_BASE_BAUD (48000000/16)
arch/arm/plat-omap/include/mach/system.h +7 -0
@@ -48,4 +48,11 @@ static inline void arch_reset(char mode, const char *cmd) omap_prcm_arch_reset(mode); } +#ifdef CONFIG_ARCH_OMAP4 +void omap_prcm_arch_reset (char mode) +{ +/* dummy hook for Linking */ +} +#endif +#endif
Signature · 1 line
1.5.4.7
RFC PATCH 4/7 OMAP4: Update common omap platform common sources.
This patch updates the common platform source files for OMAP4430. Few OMAP4 peripherals are common with OMAP3 architecture.
--- arch/arm/plat-omap/common.c | 29 +++++++++++- arch/arm/plat-omap/devices.c | 2 + arch/arm/plat-omap/dma.c | 10 +++- arch/arm/plat-omap/dmtimer.c | 42 +++++++++++++++-- arch/arm/plat-omap/gpio.c | 109 ++++++++++++++++++++++++++++------------- arch/arm/plat-omap/io.c | 18 +++++++- arch/arm/plat-omap/mux.c | 3 + arch/arm/plat-omap/sram.c | 20 ++++++++ 8 files changed, 189 insertions(+), 44 deletions(-)
arch/arm/plat-omap/common.c +28 -1
@@ -177,7 +177,8 @@ console_initcall(omap_add_serial_console);#if defined(CONFIG_ARCH_OMAP16XX )#define TIMER_32K_SYNCHRONIZED 0xfffbc410 -#elif defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#elif defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )#define TIMER_32K_SYNCHRONIZED (OMAP2_32KSYNCT_BASE + 0x10)#endif
@@ -252,6 +253,16 @@ static void __init __omap2_set_globals(void)#endif +#if defined(CONFIG_ARCH_OMAP4 )/* sdrc and sms are not needed on omap4*/ +static struct omap_globals *omap2_globals; + +static void __init __omap2_set_globals (void ) +{ +omap2_set_globals_tap (omap2_globals); +omap2_set_globals_control (omap2_globals); +} +#endif +#if defined(CONFIG_ARCH_OMAP2420 ) static struct omap_globals omap242x_globals = {
@@ -309,3 +320,19 @@ void __init omap2_set_globals_343x(void) }#endif +#if defined(CONFIG_ARCH_OMAP4430 ) +static struct omap_globals omap443x_globals = { + .class =OMAP443X_CLASS , + .tap =OMAP2_IO_ADDRESS (0x4830A000 ), + .ctrl =OMAP2_IO_ADDRESS (OMAP443X_CTRL_BASE ), + .prm =OMAP2_IO_ADDRESS (OMAP4430_PRM_BASE ), + .cm =OMAP2_IO_ADDRESS (OMAP4430_CM_BASE ), +}; + +void __init omap2_set_globals_443x (void ) +{ + omap2_globals = &omap443x_globals; +__omap2_set_globals (); +} +#endif +
arch/arm/plat-omap/devices.c +2 -0
@@ -311,6 +311,8 @@ static void omap_init_wdt(void) wdt_resources[0 ].start =0x49016000 ;/* WDT2 */ else if (cpu_is_omap343x()) wdt_resources[0].start = 0x48314000; /* WDT2 */ + else if (cpu_is_omap44xx()) + wdt_resources[0].start = 0x4A314000; else return;
arch/arm/plat-omap/dma.c +7 -3
@@ -852,7 +852,7 @@ omap_dma_set_prio_lch(int lch, unsigned char read_prio, } l =dma_read (CCR (lch)); l &= ~((1 <<6 ) | (1 <<26 )); -if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) +if (cpu_is_omap2430 () ||cpu_is_omap34xx () ||cpu_is_omap44xx ()) l |= ((read_prio &0x1 ) <<6 ) | ((write_prio &0x1 ) <<26 );else l |= ((read_prio &0x1 ) <<6 );
@@ -1824,7 +1824,8 @@ static irqreturn_t omap1_dma_irq_handler(int irq, void *dev_id)#define omap1_dma_irq_handler NULL#endif -#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )static int omap2_dma_handle_ch (int ch) {
@@ -2319,6 +2320,9 @@ static int __init omap_init_dma(void) }else if (cpu_is_omap34xx ()) { omap_dma_base =IO_ADDRESS (OMAP34XX_DMA4_BASE ); dma_lch_count =OMAP_DMA4_LOGICAL_DMA_CH_COUNT ; + }else if (cpu_is_omap44xx ()) { + omap_dma_base =IO_ADDRESS (OMAP44XX_DMA4_BASE ); + dma_lch_count =OMAP_DMA4_LOGICAL_DMA_CH_COUNT ; }else {pr_err ("DMA init failed for unsupported omap\n" );return -ENODEV ;
@@ -2417,7 +2421,7 @@ static int __init omap_init_dma(void) } } -if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) +if (cpu_is_omap2430 () ||cpu_is_omap34xx () ||cpu_is_omap44xx ())omap_dma_set_global_params (DMA_DEFAULT_ARB_RATE ,DMA_DEFAULT_FIFO_DEPTH ,0 );
arch/arm/plat-omap/dmtimer.c +38 -4
72 lines not on this page · raw message
arch/arm/plat-omap/gpio.c +74 -35
330 lines not on this page · raw message
arch/arm/plat-omap/io.c +17 -1
@@ -7,6 +7,7 @@#include <mach/omap16xx.h> #include <mach/omap24xx.h> #include <mach/omap34xx.h> +#include <mach/omap44xx.h> #define BETWEEN (p,st,sz) ((p) >= (st) && (p) < ((st) + (sz)))#define XLATE (p,pst,vst) ((void __iomem *)((p) - (pst) + (vst)))
@@ -92,7 +93,22 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)return XLATE (p,L4_EMU_34XX_PHYS ,L4_EMU_34XX_VIRT ); }#endif - +#ifdef CONFIG_ARCH_OMAP4 +if (cpu_is_omap44xx ()) { +if (BETWEEN (p,L3_44XX_PHYS ,L3_44XX_SIZE )) +return XLATE (p,L3_44XX_PHYS ,L3_44XX_VIRT ); +if (BETWEEN (p,L4_44XX_PHYS ,L4_44XX_SIZE )) +return XLATE (p,L4_44XX_PHYS ,L4_44XX_VIRT ); +if (BETWEEN (p,L4_WK_44XX_PHYS ,L4_WK_44XX_SIZE )) +return XLATE (p,L4_WK_44XX_PHYS ,L4_WK_44XX_VIRT ); +if (BETWEEN (p,OMAP44XX_GPMC_PHYS ,OMAP44XX_GPMC_SIZE )) +return XLATE (p,OMAP44XX_GPMC_PHYS ,OMAP44XX_GPMC_VIRT ); +if (BETWEEN (p,L4_PER_44XX_PHYS ,L4_PER_44XX_SIZE )) +return XLATE (p,L4_PER_44XX_PHYS ,L4_PER_44XX_VIRT ); +if (BETWEEN (p,L4_EMU_44XX_PHYS ,L4_EMU_44XX_SIZE )) +return XLATE (p,L4_EMU_44XX_PHYS ,L4_EMU_44XX_VIRT ); + } +#endif return __arm_ioremap (p, size, type); }EXPORT_SYMBOL (omap_ioremap);
arch/arm/plat-omap/mux.c +3 -0
@@ -54,6 +54,9 @@ int __init_or_module omap_cfg_reg(const unsigned long index) {struct pin_config *reg; +if (cpu_is_omap44xx ()) +return 0 ; +if (mux_cfg ==NULL ) {printk (KERN_ERR "Pin mux table not initialized\n" );return -ENODEV ;
arch/arm/plat-omap/sram.c +20 -0
@@ -44,6 +44,8 @@#define OMAP3_SRAM_VA 0xd7000000#define OMAP3_SRAM_PUB_PA 0x40208000#define OMAP3_SRAM_PUB_VA 0xd7008000 +#define OMAP4_SRAM_PA 0x40200000/*0x402f0000*/ +#define OMAP4_SRAM_VA 0xd7000000/*0xd70f0000*/ #if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX )#define SRAM_BOOTLOADER_SZ 0x00
@@ -87,6 +89,10 @@ static int is_sram_locked(void) {int type =0 ; +if (cpu_is_omap44xx ()) +/* Not yet supported */ +return 0 ; +if (cpu_is_omap242x ()) type =omap_rev () &OMAP2_DEVICETYPE_MASK ;
@@ -135,6 +141,10 @@ void __init omap_detect_sram(void) omap_sram_base =OMAP3_SRAM_VA ; omap_sram_start =OMAP3_SRAM_PA ; omap_sram_size =0x10000 ;/* 64K */ + }else if (cpu_is_omap44xx ()) { + omap_sram_base =OMAP4_SRAM_VA ; + omap_sram_start =OMAP4_SRAM_PA ; + omap_sram_size =0x8000 ;/* 32K */ }else { omap_sram_base =OMAP2_SRAM_VA ; omap_sram_start =OMAP2_SRAM_PA ;
@@ -203,6 +213,12 @@ void __init omap_map_sram(void) omap_sram_io_desc[0 ].pfn =__phys_to_pfn (base); } +if (cpu_is_omap44xx ()) { + omap_sram_io_desc[0 ].virtual =OMAP4_SRAM_VA ; + base =OMAP4_SRAM_PA ; + base =ROUND_DOWN (base,PAGE_SIZE ); + omap_sram_io_desc[0 ].pfn =__phys_to_pfn (base); + } omap_sram_io_desc[0 ].length =1024 *1024 ;/* Use section desc */ iotable_init (omap_sram_io_desc,ARRAY_SIZE (omap_sram_io_desc));
@@ -242,10 +258,12 @@ void * omap_sram_push(void * start, unsigned long size)return (void *)omap_sram_ceil; } +#ifndef CONFIG_ARCH_OMAP4 /* to remove compile time warning */ static void omap_sram_error (void ) {panic ("Uninitialized SRAM function\n" ); } +#endif #ifdef CONFIG_ARCH_OMAP1
@@ -406,6 +424,8 @@ int __init omap_sram_init(void)omap243x_sram_init (); else if (cpu_is_omap34xx()) omap34xx_sram_init(); + else if (cpu_is_omap44xx()) + omap34xx_sram_init(); /* REVISIT: */return 0 ; }
Signature · 1 line
1.5.4.7
RFC PATCH 5/7 OMAP4: Update common omap machine specific sources.
This patch updates the common machine spcific source files for OMAP4430. Few OMAP4 peripherals are common with OMAP3 architecture. Lot of code gets re-used because of this.
--- arch/arm/mach-omap2/gpmc.c | 3 ++ arch/arm/mach-omap2/id.c | 5 +++- arch/arm/mach-omap2/io.c | 48 ++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/timer-gp.c | 6 ++++- 4 files changed, 60 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/gpmc.c +3 -0
@@ -424,6 +424,9 @@ void __init gpmc_init(void) }else if (cpu_is_omap34xx ()) { ck ="gpmc_fck" ; l =OMAP34XX_GPMC_BASE ; + }else if (cpu_is_omap44xx ()) { + ck ="gpmc_fck" ; + l =OMAP44XX_GPMC_BASE ; } gpmc_l3_clk =clk_get (NULL , ck);
arch/arm/mach-omap2/id.c +4 -1
@@ -196,7 +196,10 @@ void __init omap2_check_revision(void)* At this point we have an idea about the processor revision set * earlier with omap2_set_globals_tap(). */ -if (cpu_is_omap24xx ()) +if (cpu_is_omap44xx ()) { +printk (KERN_INFO "CPU revision = OMAP4430\n" );/* Fix Me*/ +return ; + }else if (cpu_is_omap24xx ())omap24xx_check_revision ();else if (cpu_is_omap34xx ())omap34xx_check_revision ();
arch/arm/mach-omap2/io.c +48 -0
81 lines not on this page · raw message
arch/arm/mach-omap2/timer-gp.c +5 -1
@@ -75,7 +75,8 @@ static void omap2_gp_timer_set_mode(enum clock_event_mode mode,case CLOCK_EVT_MODE_PERIODIC : period =clk_get_rate (omap_dm_timer_get_fclk (gptimer)) /HZ ; period -=1 ; - +if (cpu_is_omap44xx ()) + period =0xFF ;omap_dm_timer_set_load_start (gptimer,1 ,0xffffffff - period);break ;case CLOCK_EVT_MODE_ONESHOT :
@@ -108,6 +109,9 @@ static void __init omap2_gp_clockevent_init(void)omap_dm_timer_set_source (gptimer,OMAP_TIMER_SRC_SYS_CLK );#endif tick_rate =clk_get_rate (omap_dm_timer_get_fclk (gptimer)); +if (cpu_is_omap44xx ()) +/* Assuming 32kHz clk is driving GPT1 */ + tick_rate =32768 ; omap2_gp_timer_irq.dev_id = (void *)gptimer;setup_irq (omap_dm_timer_get_irq (gptimer), &omap2_gp_timer_irq);
Signature · 1 line
1.5.4.7
RFC PATCH 6/7 OMAP4: Clock hack since clock management framework not in.
This patch update the cooomon clock.c file for OMAP4. The clk_get() and clk_put() sunctions are moved to common place in arch/arm/common/clkdev.c Since on current OMAP$ platform clk management is still not supported, the internal file is hacked.
Once the framework is ready the CONFIG_CLKDEV will be used.
--- arch/arm/plat-omap/clock.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-)
arch/arm/plat-omap/clock.c +26 -0
@@ -36,10 +36,30 @@ static struct clk_functions *arch_clock;* Standard clock functions defined in include/linux/clk.h *-------------------------------------------------------------------------*/ +/* This functions is moved to arch/arm/common/clkdev.c. For OMAP4 since +* clock framework is not up , it is defined here to avoid rework in +* every driver */ + +/* Dummy hooks only for OMAP4.For rest OMAPs, common clkdev is used */ +#if defined(CONFIG_ARCH_OMAP4 ) +struct clk *clk_get (struct device *dev,const char *id) +{ +return 0 ; +} +EXPORT_SYMBOL (clk_get); + +void clk_put (struct clk *clk) +{ +} +EXPORT_SYMBOL (clk_put); +#endif int clk_enable (struct clk *clk) {unsigned long flags;int ret =0 ; +if (cpu_is_omap44xx ()) +/* OMAP4 clk framework not supported yet */ +return 0 ;if (clk ==NULL ||IS_ERR (clk))return -EINVAL ;
@@ -56,6 +76,9 @@ EXPORT_SYMBOL(clk_enable);void clk_disable (struct clk *clk) {unsigned long flags; +if (cpu_is_omap44xx ()) +/* OMAP4 clk framework not supported yet */ +return ;if (clk ==NULL ||IS_ERR (clk))return ;
@@ -80,6 +103,9 @@ unsigned long clk_get_rate(struct clk *clk) {unsigned long flags;unsigned long ret =0 ; +if (cpu_is_omap44xx ()) +/* OMAP4 clk framework not supported yet */ +return 0 ;if (clk ==NULL ||IS_ERR (clk))return 0 ;
Signature · 1 line
1.5.4.7
RFC PATCH 7/7 OMAP4: Enable basic build support.
This patch updates the Makefile and defconfig for OMAP4. Minimal set of drivers are enabled fot the kernel bootup.
--- arch/arm/Makefile | 1 + arch/arm/configs/omap_4430sdp_defconfig | 807 +++++++++++++++++++++++++++++++ arch/arm/mach-omap2/Makefile | 6 +- 3 files changed, 813 insertions(+), 1 deletions(-) create mode 100644 arch/arm/configs/omap_4430sdp_defconfig
arch/arm/Makefile +1 -0
@@ -127,6 +127,7 @@ endif machine-$(CONFIG_ARCH_OMAP1) := omap1 machine-$(CONFIG_ARCH_OMAP2) := omap2 machine-$(CONFIG_ARCH_OMAP3) := omap2 + machine-$(CONFIG_ARCH_OMAP4) := omap2 plat-$(CONFIG_ARCH_OMAP) := omap machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
arch/arm/configs/omap_4430sdp_defconfig new file +807 -0
807 lines not on this page · raw message
arch/arm/mach-omap2/Makefile +5 -1
@@ -3,9 +3,13 @@ # # Common support +ifeq ($(CONFIG_ARCH_OMAP4),y) +obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o +else obj-y := irq.o id.o io.o sdrc.o control.o prcm.o clock.o mux.o \ devices.o serial.o gpmc.o timer-gp.o powerdomain.o \ clockdomain.o +endif obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
@@ -44,7 +48,7 @@ obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \ mmc-twl4030.o obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ mmc-twl4030.o - +obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ board-rx51-peripherals.o \ mmc-twl4030.o
Signature · 1 line
1.5.4.7
Tony Lindgren
maintainerRe: [PATCH 7/7][RFC] OMAP4: Enable basic build support.
Quoted 10 lines · Santosh Shilimkar
This patch updates the
Makefileand defconfig for OMAP4. Minimal set of drivers are enabled fot the kernel bootup.Signed-off-by Santosh Shilimkar <[email protected]>--- arch/arm/Makefile | 1 + arch/arm/configs/omap_4430sdp_defconfig | 807 +++++++++++++++++++++++++++++++ arch/arm/mach-omap2/Makefile | 6 +- 3 files changed, 813 insertions(+), 1 deletions(-) create mode 100644 arch/arm/configs/omap_4430sdp_defconfig
<snip snip>
Quoted 5 lines
arch/arm/mach-omap2/Makefile +0
-0
arch/arm/mach-omap2/Makefile line 12
Quoted 10 lines
arch/arm/mach-omap2/Makefile +4
-0@@ -3,9 +3,13 @@ # # Common support +ifeq ($(CONFIG_ARCH_OMAP4),y) +obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o +else obj-y := irq.o id.o io.o sdrc.o control.o prcm.o clock.o mux.o \ devices.o serial.o gpmc.o timer-gp.o powerdomain.o \ clockdomain.o +endif
This ifeq else we don't want to do as it breaks things for multi-omap.
Regards,
Tony
Quoted 12 lines
arch/arm/mach-omap2/Makefile +1
-1obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o@@ -44,7 +48,7 @@ obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \ mmc-twl4030.o obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ mmc-twl4030.o - +obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ board-rx51-peripherals.o \ mmc-twl4030.o
RE: [PATCH 7/7][RFC] OMAP4: Enable basic build support.
Quoted 27 lines
-----Original Message-----
From: Tony Lindgren [mailto:[email protected]]
Sent: Wednesday, April 22, 2009 12:10 AM
To: Shilimkar, Santosh
Cc: [email protected]
Subject: Re: [PATCH 7/7][RFC] OMAP4: Enable basic build support.Quoted 1 line · Santosh Shilimkar
This patch updates the
Makefileand defconfig for OMAP4.Minimal set of
Review
Quoted 6 lines
drivers are enabled fot the kernel bootup.
Signed-off-by Santosh Shilimkar <[email protected]>---
(quoted diff) +0
-0b/arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/Makefile line 7
Quoted 9 lines
index c49d9bf..68d50a8 100644
arch/arm/mach-omap2/Makefile +2
-0@@ -3,9 +3,13 @@ # # Common support +ifeq ($(CONFIG_ARCH_OMAP4),y) +obj-y := id.o io.o control.o mux.o devices.o serial.ogpmc.o timer-gp.o
Quoted 7 lines
arch/arm/mach-omap2/Makefile line 12
Quoted 5 lines
arch/arm/mach-omap2/Makefile +2
-0+else obj-y := irq.o id.o io.o sdrc.o control.o prcm.o clock.o mux.o \ devices.o serial.o gpmc.o timer-gp.o powerdomain.o \ clockdomain.o +endifThis ifeq else we don't want to do as it breaks things for multi-omap.
How do we handle this. For OMAP4, those files are not common and needed at this point of time. More so if we agree that OMAP4 won't support multi-omap, then this should be ok. Some thing like this can be done but then Makefile will be completely rewamped.
# Common support
obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o
obj-$(CONFIG_ARCH_OMAP2) += display.o sdrc.o prcm.o clock.o powerdomain.o clockdomain.o obj-$(CONFIG_ARCH_OMAP3) += display.o sdrc.o prcm.o clock.o powerdomain.o clockdomain.o
Is this OK ?
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP2/3: Reorganize Makefile to add omap4 support (Re: [PATCH 7/7][RFC] OMAP4: Enable basic build support.)
Quoted 35 lines · Shilimkar, Santosh
Quoted 27 lines
-----Original Message-----
From: Tony Lindgren [mailto:[email protected]]
Sent: Wednesday, April 22, 2009 12:10 AM
To: Shilimkar, Santosh
Cc: [email protected]
Subject: Re: [PATCH 7/7][RFC] OMAP4: Enable basic build support.Quoted 1 line · Santosh Shilimkar
This patch updates the
Makefileand defconfig for OMAP4.Minimal set of
Review
Quoted 6 lines
drivers are enabled fot the kernel bootup.
Signed-off-by Santosh Shilimkar <[email protected]>---
(quoted diff) +0
-0b/arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/Makefile line 7
Quoted 9 lines
index c49d9bf..68d50a8 100644
arch/arm/mach-omap2/Makefile +2
-0@@ -3,9 +3,13 @@ # # Common support +ifeq ($(CONFIG_ARCH_OMAP4),y) +obj-y := id.o io.o control.o mux.o devices.o serial.ogpmc.o timer-gp.o
Quoted 7 lines
arch/arm/mach-omap2/Makefile line 12
Quoted 5 lines
arch/arm/mach-omap2/Makefile +2
-0+else obj-y := irq.o id.o io.o sdrc.o control.o prcm.o clock.o mux.o \ devices.o serial.o gpmc.o timer-gp.o powerdomain.o \ clockdomain.o +endifThis ifeq else we don't want to do as it breaks things for multi-omap.
Quoted 1 line
How do we handle this. For OMAP4, those files are not common and needed at this point of time. More so if we agree that OMAP4 won't support multi-omap, then this should be ok.
No way we're dropping multi-omap for a few ifdefs.
We need to have code where we can compile in all the selected things. In this case we should be able to select any combination of CONFIG_ARCH_OMAP2, CONFIG_ARCH_OMAP3, CONFIG_ARCH_OMAP4. And the code already gets optimized if only one is selected.
The recent omap2 clock breakage with trivial clock patches is already a good enough reason to support the multi-omap. So basically all the developers should do their builds with the multi-omap selected.
Also the distros want multi-omap. Only the product specific kernels should be built with only one option selected to optimize for speed and size.
Quoted 9 lines
Some thing like this can be done but then
Makefilewill be completely rewamped.# Common support
obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.oobj-$(CONFIG_ARCH_OMAP2) += display.o sdrc.o prcm.o clock.o powerdomain.o clockdomain.o obj-$(CONFIG_ARCH_OMAP3) += display.o sdrc.o prcm.o clock.o powerdomain.o clockdomain.o
Is this OK ?
How about the attached patch?
Tony
Quoted 1 line
From
60e0a0d9c74e2aaf4adcd1ab9f045fd8e62a3092Mon Sep 17 00:00:00 2001
From: Tony Lindgren <[email protected]>
Date: Wed, 22 Apr 2009 11:59:58 -0700
Subject: [PATCH] ARM: OMAP2/3: Reorganize Makefile to add omap4 support
We don't necessarily want to compile in irq.o and sdrc.o for omap4. Also, clock and prcm may not be implemented initially.
arch/arm/mach-omap2/Makefile +8 -3
@@ -3,9 +3,14 @@ # # Common support -obj-y := irq.o id.o io.o sdrc.o control.o prcm.o clock.o mux.o \ - devices.o serial.o gpmc.o timer-gp.o powerdomain.o \ - clockdomain.o +obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o + +omap-2-3-common = irq.o sdrc.o +prcm-common = prcm.o powerdomain.o +clock-common = clock.o clockdomain.o + +obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(clock-common) +obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(clock-common) obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
RE: [PATCH] ARM: OMAP2/3: Reorganize Makefile to add omap4 support (Re: [PATCH 7/7][RFC] OMAP4: Enable basic build support.)
Quoted 22 lines
Quoted 1 line
Quoted 1 line
This ifeq else we don't want to do as it breaks things
for multi-omap.
Quoted 2 lines
How do we handle this. For OMAP4, those files are not
common and needed at this point of time. More so if we agree that OMAP4 won't support multi-omap, then this should be ok.
No way we're dropping multi-omap for a few ifdefs.
We need to have code where we can compile in all the selected things. In this case we should be able to select any combination of
CONFIG_ARCH_OMAP2,CONFIG_ARCH_OMAP3,CONFIG_ARCH_OMAP4. And the code already gets optimized if
only one is selected.The recent omap2 clock breakage with trivial clock patches is already a
good enough reason to support the multi-omap. So basically all the developers
should do their builds with the multi-omap selected.
Quoted 3 lines
Also the distros want multi-omap. Only the product specific kernels should be built with only one option selected to optimize for speed and size.
I think most of the things are in place for multi-omap for OMAP4 as well if all the comments are taken care.
Quoted 7 lines
Quoted 1 line
Some thing like this can be done but then
Makefilewill becompletely rewamped.
Quoted 3 lines
# Common support
obj-y := id.o io.o control.o mux.o devices.o serial.ogpmc.o timer-gp.o
Quoted 1 line
Quoted 8 lines
Quoted 1 line
obj-$(CONFIG_ARCH_OMAP2) += display.o sdrc.o prcm.o clock.o
powerdomain.o clockdomain.o
Quoted 1 line
obj-$(CONFIG_ARCH_OMAP3) += display.o sdrc.o prcm.o clock.o
powerdomain.o clockdomain.o
Quoted 2 lines
Is this OK ?
How about the attached patch?
Looks good. After adding clock support stubs we need to compile almost all files except 'clock.c' so we may not need this completely. But any case, the patch looks cleaner.
Tony Lindgren
maintainerRe: [PATCH] ARM: OMAP2/3: Reorganize Makefile to add omap4 support (Re: [PATCH 7/7][RFC] OMAP4: Enable basic build support.)
Quoted 22 lines · Shilimkar, Santosh
Quoted 22 lines
Quoted 1 line
Quoted 1 line
This ifeq else we don't want to do as it breaks things
for multi-omap.
Quoted 2 lines
How do we handle this. For OMAP4, those files are not
common and needed at this point of time. More so if we agree that OMAP4 won't support multi-omap, then this should be ok.
No way we're dropping multi-omap for a few ifdefs.
We need to have code where we can compile in all the selected things. In this case we should be able to select any combination of
CONFIG_ARCH_OMAP2,CONFIG_ARCH_OMAP3,CONFIG_ARCH_OMAP4. And the code already gets optimized if
only one is selected.The recent omap2 clock breakage with trivial clock patches is already a
good enough reason to support the multi-omap. So basically all the developers
should do their builds with the multi-omap selected.
Quoted 4 lines
Quoted 3 lines
Also the distros want multi-omap. Only the product specific kernels should be built with only one option selected to optimize for speed and size.
I think most of the things are in place for multi-omap for OMAP4 as well if all the comments are taken care.
Yeah cool. Looks like the gic interrupt code can also be initialized from the init_common_hw or so. Of course the entry-macro.S still needs a separate non-optimized handler for things to boot, I'll update an earlier patch for that at some point.
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
Some thing like this can be done but then
Makefilewill becompletely rewamped.
Quoted 3 lines
# Common support
obj-y := id.o io.o control.o mux.o devices.o serial.ogpmc.o timer-gp.o
Quoted 2 lines
obj-$(CONFIG_ARCH_OMAP2) += display.o sdrc.o prcm.o clock.o
Quoted 8 lines
Quoted 7 lines
powerdomain.o clockdomain.o
Quoted 1 line
obj-$(CONFIG_ARCH_OMAP3) += display.o sdrc.o prcm.o clock.o
powerdomain.o clockdomain.o
Quoted 2 lines
Is this OK ?
How about the attached patch?
Looks good. After adding clock support stubs we need to compile almost all files except '
clock.c' so we may not need this completely. But any case, the patch looks cleaner.
OK
Tony
RE: [PATCH] ARM: OMAP2/3: Reorganize Makefile to add omap4 support (Re: [PATCH 7/7][RFC] OMAP4: Enable basic build support.)
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
should do their builds with the multi-omap selected.
Also the distros want multi-omap. Only the product
specific kernels
Quoted 2 lines
Quoted 2 lines
should be built with only one option selected to optimize for speed and size.
Quoted 8 lines
Quoted 1 line
I think most of the things are in place for multi-omap for
OMAP4 as well if all the comments are taken care.
Yeah cool. Looks like the gic interrupt code can also be initialized from the
init_common_hwor so. Of course theentry-macro.Sstill needs a separate non-optimized handler for things to boot, I'll update an earlier patch for that at some point.
Yes it is initialised from common hw init.
Regards
Santosh
Tony Lindgren
maintainerRe: [PATCH 6/7][RFC] OMAP4: Clock hack since clock management framework not in.
In reply to Santosh ShilimkarQuoted 5 lines · Santosh Shilimkar
This patch update the cooomon
clock.cfile for OMAP4. Theclk_get()andclk_put()sunctions are moved to common place inarch/arm/common/clkdev.cSince on current OMAP$ platform clk management is still not supported, the internal file is hacked.
Once the framework is ready theCONFIG_CLKDEVwill be used.
Maybe set up a dummy clock44xx.c instead? Then add to the comments that it's the placeholder for the upcoming omap4 clock framework.
Tony
Quoted 67 lines
Signed-off-by Santosh Shilimkar <[email protected]>--- arch/arm/plat-omap/clock.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-)arch/arm/plat-omap/clock.c +26
-0@@ -36,10 +36,30 @@ static struct clk_functions *arch_clock;* Standard clock functions defined in include/linux/clk.h *-------------------------------------------------------------------------*/ +/* This functions is moved to arch/arm/common/clkdev.c. For OMAP4 since +* clock framework is not up , it is defined here to avoid rework in +* every driver */ + +/* Dummy hooks only for OMAP4.For rest OMAPs, common clkdev is used */ +#if defined(CONFIG_ARCH_OMAP4 ) +struct clk *clk_get (struct device *dev,const char *id) +{ +return 0 ; +} +EXPORT_SYMBOL (clk_get); + +void clk_put (struct clk *clk) +{ +} +EXPORT_SYMBOL (clk_put); +#endif int clk_enable (struct clk *clk) {unsigned long flags;int ret =0 ; +if (cpu_is_omap44xx ()) +/* OMAP4 clk framework not supported yet */ +return 0 ;if (clk ==NULL ||IS_ERR (clk))return -EINVAL ;@@ -56,6 +76,9 @@ EXPORT_SYMBOL(clk_enable);void clk_disable (struct clk *clk) {unsigned long flags; +if (cpu_is_omap44xx ()) +/* OMAP4 clk framework not supported yet */ +return ;if (clk ==NULL ||IS_ERR (clk))return ;@@ -80,6 +103,9 @@ unsigned long clk_get_rate(struct clk *clk) {unsigned long flags;unsigned long ret =0 ; +if (cpu_is_omap44xx ()) +/* OMAP4 clk framework not supported yet */ +return 0 ;if (clk ==NULL ||IS_ERR (clk))return 0 ;Signature · 6 lines
1.5.4.7 -- 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
RE: [PATCH 5/7][RFC] OMAP4: Update common omap machine specific sources.
In reply to Santosh Shilimkararch/arm/mach-omap2/timer-gp.c static void __init omap2_gp_clockevent_init(void) · line 114
Quoted 8 lines
case
CLOCK_EVT_MODE_ONESHOT:arch/arm/mach-omap2/timer-gp.c +3
-0@@ -108,6 +109,9 @@ static void __init omap2_gp_clockevent_init(void)omap_dm_timer_set_source (gptimer,OMAP_TIMER_SRC_SYS_CLK );#endif tick_rate =clk_get_rate (omap_dm_timer_get_fclk (gptimer)); +if (cpu_is_omap44xx ()) +/* Assuming 32kHz clk is driving GPT1 */ + tick_rate =32768 ;
[Romit] This should be read from CM_CLKSEL_WKUP.CLKSEL_GPT1 to be proper.
Re: [PATCH 5/7][RFC] OMAP4: Update common omap machine specific sources.
In reply to Santosh ShilimkarQuoted 5 lines · Santosh Shilimkar
This patch updates the common machine spcific source files for OMAP4430. Few OMAP4 peripherals are common with OMAP3 architecture. Lot of code gets re-used because of this.
Signed-off-by Santosh Shilimkar <[email protected]>
[...]
Quoted 13 lines
arch/arm/mach-omap2/io.c +1
-0@@ -30,6 +30,7 @@#include <mach/sdrc.h> #include <mach/gpmc.h> +#ifndef CONFIG_ARCH_OMAP4 /* Clock framework is still not supported for OMAP4*/ #include "clock.h" #include <mach/powerdomain.h>
arch/arm/mach-omap2/io.c line 42
Quoted 4 lines
arch/arm/mach-omap2/io.c +1
-0@@ -38,6 +39,7 @@#include <mach/clockdomain.h> #include "clockdomains.h" +#endif
Clock fw is not supported, but including these files should be harmless.
[...]
Quoted 14 lines
arch/arm/mach-omap2/io.c +4
-0void __init omap2_map_common_io (void ) {@@ -183,6 +225,10 @@ void __init omap2_map_common_io(void)iotable_init (omap34xx_io_desc,ARRAY_SIZE (omap34xx_io_desc));#endif +#if defined(CONFIG_ARCH_OMAP44XX ) +iotable_init (omap44xx_io_desc,ARRAY_SIZE (omap44xx_io_desc)); +#endif +/* Normally devicemaps_init() would flush caches and tlb after * mdesc->map_io(), but we must also do it here because of the CPU * revision check below.
arch/arm/mach-omap2/io.c void __init omap2_map_common_io(void) · line 252
Quoted 9 lines
arch/arm/mach-omap2/io.c +2
-0@@ -198,9 +244,11 @@ void __init omap2_map_common_io(void)void __init omap2_init_common_hw (struct omap_sdrc_params *sp) {omap2_mux_init (); +#ifndef CONFIG_ARCH_OMAP4 /* REVISIT: to avoid build errors */ pwrdm_init (powerdomains_omap);clkdm_init (clockdomains_omap, clkdm_pwrdm_autodeps);omap2_clk_init ();omap2_sdrc_init (sp); +#endif
Rather than the #ifdef here, can you stub these out in the relevant files instead.
arch/arm/mach-omap2/timer-gp.c static void omap2_gp_timer_set_mode(enum clock_event_mode mode, · line 79
Quoted 13 lines
arch/arm/mach-omap2/io.c +0
-0gpmc_init (); }arch/arm/mach-omap2/timer-gp.c +2
-1@@ -75,7 +75,8 @@ static void omap2_gp_timer_set_mode(enum clock_event_mode mode,case CLOCK_EVT_MODE_PERIODIC : period =clk_get_rate (omap_dm_timer_get_fclk (gptimer)) /HZ ; period -=1 ; - +if (cpu_is_omap44xx ()) + period =0xFF ;
Put a FIXME here noting that this should be removed when clk fw is implemented.
arch/arm/mach-omap2/timer-gp.c static void __init omap2_gp_clockevent_init(void) · line 115
Quoted 11 lines
arch/arm/mach-omap2/timer-gp.c +3
-0omap_dm_timer_set_load_start (gptimer,1 ,0xffffffff - period);break ;case CLOCK_EVT_MODE_ONESHOT :@@ -108,6 +109,9 @@ static void __init omap2_gp_clockevent_init(void)omap_dm_timer_set_source (gptimer,OMAP_TIMER_SRC_SYS_CLK );#endif tick_rate =clk_get_rate (omap_dm_timer_get_fclk (gptimer)); +if (cpu_is_omap44xx ()) +/* Assuming 32kHz clk is driving GPT1 */ + tick_rate =32768 ;
ditto
Kevin
Tony Lindgren
maintainerRe: [PATCH 5/7][RFC] OMAP4: Update common omap machine specific sources.
In reply to Santosh ShilimkarQuoted 110 lines · Santosh Shilimkar
This patch updates the common machine spcific source files for OMAP4430. Few OMAP4 peripherals are common with OMAP3 architecture. Lot of code gets re-used because of this.
Signed-off-by Santosh Shilimkar <[email protected]>--- arch/arm/mach-omap2/gpmc.c | 3 ++ arch/arm/mach-omap2/id.c | 5 +++- arch/arm/mach-omap2/io.c | 48 ++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/timer-gp.c | 6 ++++- 4 files changed, 60 insertions(+), 2 deletions(-)arch/arm/mach-omap2/gpmc.c +3
-0@@ -424,6 +424,9 @@ void __init gpmc_init(void) }else if (cpu_is_omap34xx ()) { ck ="gpmc_fck" ; l =OMAP34XX_GPMC_BASE ; + }else if (cpu_is_omap44xx ()) { + ck ="gpmc_fck" ; + l =OMAP44XX_GPMC_BASE ; } gpmc_l3_clk =clk_get (NULL , ck);arch/arm/mach-omap2/id.c +4
-1@@ -196,7 +196,10 @@ void __init omap2_check_revision(void)* At this point we have an idea about the processor revision set * earlier with omap2_set_globals_tap(). */ -if (cpu_is_omap24xx ()) +if (cpu_is_omap44xx ()) { +printk (KERN_INFO "CPU revision = OMAP4430\n" );/* Fix Me*/ +return ; + }else if (cpu_is_omap24xx ())omap24xx_check_revision ();else if (cpu_is_omap34xx ())omap34xx_check_revision ();arch/arm/mach-omap2/io.c +42
-0@@ -30,6 +30,7 @@#include <mach/sdrc.h> #include <mach/gpmc.h> +#ifndef CONFIG_ARCH_OMAP4 /* Clock framework is still not supported for OMAP4*/ #include "clock.h" #include <mach/powerdomain.h> @@ -38,6 +39,7 @@#include <mach/clockdomain.h> #include "clockdomains.h" +#endif /* * The machine specific code may provide the extra mapping besides the @@ -166,6 +168,46 @@ static struct map_desc omap34xx_io_desc[] __initdata = { }, };#endif +#ifdef CONFIG_ARCH_OMAP44XX +static struct map_desc omap44xx_io_desc[]__initdata = { + { + .virtual =L3_44XX_VIRT , + .pfn =__phys_to_pfn (L3_44XX_PHYS ), + .length =L3_44XX_SIZE , + .type =MT_DEVICE + }, + { + .virtual =L4_44XX_VIRT , + .pfn =__phys_to_pfn (L4_44XX_PHYS ), + .length =L4_44XX_SIZE , + .type =MT_DEVICE + }, + { + .virtual =L4_WK_44XX_VIRT , + .pfn =__phys_to_pfn (L4_WK_44XX_PHYS ), + .length =L4_WK_44XX_SIZE , + .type =MT_DEVICE + }, + { + .virtual =OMAP44XX_GPMC_VIRT , + .pfn =__phys_to_pfn (OMAP44XX_GPMC_PHYS ), + .length =OMAP44XX_GPMC_SIZE , + .type =MT_DEVICE + }, + { + .virtual =L4_PER_44XX_VIRT , + .pfn =__phys_to_pfn (L4_PER_44XX_PHYS ), + .length =L4_PER_44XX_SIZE , + .type =MT_DEVICE + }, + { + .virtual =L4_EMU_44XX_VIRT , + .pfn =__phys_to_pfn (L4_EMU_44XX_PHYS ), + .length =L4_EMU_44XX_SIZE , + .type =MT_DEVICE + }, +}; +#endif void __init omap2_map_common_io (void ) {
arch/arm/mach-omap2/io.c void __init omap2_map_common_io(void) · line 231
Quoted 7 lines
arch/arm/mach-omap2/io.c +4
-0@@ -183,6 +225,10 @@ void __init omap2_map_common_io(void)iotable_init (omap34xx_io_desc,ARRAY_SIZE (omap34xx_io_desc));#endif +#if defined(CONFIG_ARCH_OMAP44XX ) +iotable_init (omap44xx_io_desc,ARRAY_SIZE (omap44xx_io_desc)); +#endif +
This will break multi-omap. The cpu_is_omap44xx() works very early during the boot nowadays as the omap2_set_globals_44xx() initializes that, so please use that instead.
Quoted 5 lines
arch/arm/mach-omap2/io.c +0
-0/* Normally devicemaps_init() would flush caches and tlb after * mdesc->map_io(), but we must also do it here because of the CPU * revision check below. @@ -198,9 +244,11 @@ void __init omap2_map_common_io(void)void __init omap2_init_common_hw (struct omap_sdrc_params *sp)
arch/arm/mach-omap2/io.c void __init omap2_map_common_io(void) · line 254
Quoted 10 lines
arch/arm/mach-omap2/io.c +2
-0{omap2_mux_init (); +#ifndef CONFIG_ARCH_OMAP4 /* REVISIT: to avoid build errors */ pwrdm_init (powerdomains_omap);clkdm_init (clockdomains_omap, clkdm_pwrdm_autodeps);omap2_clk_init ();omap2_sdrc_init (sp); +#endif gpmc_init (); }
Please use cpu_is_omap44xx() here too instead of the ifndef.
Quoted 31 lines
arch/arm/mach-omap2/timer-gp.c +5
-1@@ -75,7 +75,8 @@ static void omap2_gp_timer_set_mode(enum clock_event_mode mode,case CLOCK_EVT_MODE_PERIODIC : period =clk_get_rate (omap_dm_timer_get_fclk (gptimer)) /HZ ; period -=1 ; - +if (cpu_is_omap44xx ()) + period =0xFF ;omap_dm_timer_set_load_start (gptimer,1 ,0xffffffff - period);break ;case CLOCK_EVT_MODE_ONESHOT :@@ -108,6 +109,9 @@ static void __init omap2_gp_clockevent_init(void)omap_dm_timer_set_source (gptimer,OMAP_TIMER_SRC_SYS_CLK );#endif tick_rate =clk_get_rate (omap_dm_timer_get_fclk (gptimer)); +if (cpu_is_omap44xx ()) +/* Assuming 32kHz clk is driving GPT1 */ + tick_rate =32768 ; omap2_gp_timer_irq.dev_id = (void *)gptimer;setup_irq (omap_dm_timer_get_irq (gptimer), &omap2_gp_timer_irq);Signature · 6 lines
1.5.4.7 -- 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
RE: [PATCH 5/7][RFC] OMAP4: Update common omap machine specific sources.
Regards,
Santosh
Quoted 32 lines
-----Original Message-----
From: Tony Lindgren [mailto:[email protected]]
Sent: Wednesday, April 22, 2009 12:07 AM
To: Shilimkar, Santosh
Cc: [email protected]
Subject: Re: [PATCH 5/7][RFC] OMAP4: Update common omap machine specific sources.Quoted 1 line · Santosh Shilimkar
This patch updates the common machine spcific source files
for OMAP4430.
Quoted 1 line
Few OMAP4 peripherals are common with OMAP3 architecture.
Lot of code
Quoted 7 lines
gets re-used because of this.
Signed-off-by Santosh Shilimkar <[email protected]>--- arch/arm/mach-omap2/gpmc.c | 3 ++ arch/arm/mach-omap2/id.c | 5 +++- arch/arm/mach-omap2/io.c | 48++++++++++++++++++++++++++++++++++++++++
Quoted 11 lines
arch/arm/mach-omap2/timer-gp.c | 6 ++++- 4 files changed, 60 insertions(+), 2 deletions(-)void
__initomap2_map_common_io(void)
{arch/arm/mach-omap2/io.c +0
-0@@ -183,6 +225,10 @@ void __init omap2_map_common_io(void)iotable_init (omap34xx_io_desc,ARRAY_SIZE (omap34xx_io_desc));#endif
Quoted 8 lines
arch/arm/mach-omap2/io.c void __init omap2_map_common_io(void) · line 231
Quoted 4 lines
arch/arm/mach-omap2/io.c +4
-0+#if defined(CONFIG_ARCH_OMAP44XX ) +iotable_init (omap44xx_io_desc,ARRAY_SIZE (omap44xx_io_desc)); +#endif +This will break multi-omap. The
cpu_is_omap44xx()works very early during the boot nowadays as theomap2_set_globals_44xx()initializes that, so please use that instead.
Looks possible to correct this. But I need to do this for OMAP2 and OMAp3 as well because for both the compile time switch is used. It was done for OMAP2/3 and hence I just maintained same way for OMAP4
/* Normally devicemaps_init() would flush caches and tlb after
Quoted 17 lines
Review void __init omap2_map_common_io(void) · line 232
Quoted 1 line
(quoted diff) +0
-0* mdesc->map_io(), but we must also do it here becauseof the CPU
arch/arm/mach-omap2/io.c void __init omap2_map_common_io(void) · line 254
Quoted 13 lines
arch/arm/mach-omap2/io.c +2
-0* revision check below. @@ -198,9 +244,11 @@ void __init omap2_map_common_io(void)void __init omap2_init_common_hw (struct omap_sdrc_params *sp) {omap2_mux_init (); +#ifndef CONFIG_ARCH_OMAP4 /* REVISIT: to avoid build errors */ pwrdm_init (powerdomains_omap);clkdm_init (clockdomains_omap, clkdm_pwrdm_autodeps);omap2_clk_init ();omap2_sdrc_init (sp); +#endif gpmc_init (); }Please use
cpu_is_omap44xx()here too instead of the ifndef.
If I use cpu_is_omap44xx(), then I need to write stub functions under OMAP4 macro. Kevin also suggested to write stubs. So this can be done.
Regards
Santosh
RE: [PATCH 4/7][RFC] OMAP4: Update common omap platform common sources.
In reply to Santosh ShilimkarAny specific reason to use omap2 structures?
Best regards,
Sanjeev
Quoted 806 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Santosh Shilimkar
Sent: Tuesday, April 21, 2009 6:38 PM
To: [email protected]
Cc: Shilimkar, Santosh
Subject: [PATCH 4/7][RFC] OMAP4: Update common omap platform common sources.This patch updates the common platform source files for OMAP4430. Few OMAP4 peripherals are common with OMAP3 architecture.
Signed-off-by Santosh Shilimkar <[email protected]>--- arch/arm/plat-omap/common.c | 29 +++++++++++- arch/arm/plat-omap/devices.c | 2 + arch/arm/plat-omap/dma.c | 10 +++- arch/arm/plat-omap/dmtimer.c | 42 +++++++++++++++-- arch/arm/plat-omap/gpio.c | 109 ++++++++++++++++++++++++++++------------- arch/arm/plat-omap/io.c | 18 +++++++- arch/arm/plat-omap/mux.c | 3 + arch/arm/plat-omap/sram.c | 20 ++++++++ 8 files changed, 189 insertions(+), 44 deletions(-)arch/arm/plat-omap/common.c +2
-1@@ -177,7 +177,8 @@ console_initcall(omap_add_serial_console);#if defined(CONFIG_ARCH_OMAP16XX )#define TIMER_32K_SYNCHRONIZED 0xfffbc410 -#elif defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#elif defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )#define TIMER_32K_SYNCHRONIZED (OMAP2_32KSYNCT_BASE +0x10 )#endif
arch/arm/plat-omap/common.c +1
-0@@ -252,6 +253,16 @@ static void __init __omap2_set_globals(void)#endif +#if defined(CONFIG_ARCH_OMAP4 )/* sdrc and sms are not needed on omap4*/
arch/arm/plat-omap/common.c +25
-0+static struct omap_globals *omap2_globals; + +static void __init __omap2_set_globals (void ) +{ +omap2_set_globals_tap (omap2_globals); +omap2_set_globals_control (omap2_globals); +} +#endif +#if defined(CONFIG_ARCH_OMAP2420 ) static struct omap_globals omap242x_globals = {@@ -309,3 +320,19 @@ void __init omap2_set_globals_343x(void) }#endif +#if defined(CONFIG_ARCH_OMAP4430 ) +static struct omap_globals omap443x_globals = { + .class =OMAP443X_CLASS , + .tap =OMAP2_IO_ADDRESS (0x4830A000 ), + .ctrl =OMAP2_IO_ADDRESS (OMAP443X_CTRL_BASE ), + .prm =OMAP2_IO_ADDRESS (OMAP4430_PRM_BASE ), + .cm =OMAP2_IO_ADDRESS (OMAP4430_CM_BASE ), +}; + +void __init omap2_set_globals_443x (void ) +{ + omap2_globals = &omap443x_globals; +__omap2_set_globals (); +} +#endif +arch/arm/plat-omap/devices.c +2
-0@@ -311,6 +311,8 @@ static void omap_init_wdt(void) wdt_resources[0 ].start =0x49016000 ;/* WDT2 */ else if (cpu_is_omap343x()) wdt_resources[0].start = 0x48314000; /* WDT2 */ + else if (cpu_is_omap44xx()) + wdt_resources[0].start = 0x4A314000; else return;arch/arm/plat-omap/dma.c +1
-1@@ -852,7 +852,7 @@ omap_dma_set_prio_lch(int lch, unsignedchar read_prio, } l =dma_read (CCR (lch)); l &= ~((1 <<6 ) | (1 <<26 )); -if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) +if (cpu_is_omap2430 () ||cpu_is_omap34xx () ||cpu_is_omap44xx ()) l |= ((read_prio & 0x1) << 6) | ((write_prio &0x1) << 26); else l |= ((read_prio & 0x1) << 6);arch/arm/plat-omap/dma.c +2
-1@@ -1824,7 +1824,8 @@ static irqreturn_t omap1_dma_irq_handler(int irq, void *dev_id) #define omap1_dma_irq_handler NULL#endif -#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )static int omap2_dma_handle_ch (int ch){
arch/arm/plat-omap/dma.c +4
-1@@ -2319,6 +2320,9 @@ static int __init omap_init_dma(void) }else if (cpu_is_omap34xx ()) { omap_dma_base =IO_ADDRESS (OMAP34XX_DMA4_BASE ); dma_lch_count =OMAP_DMA4_LOGICAL_DMA_CH_COUNT ; + }else if (cpu_is_omap44xx ()) { + omap_dma_base =IO_ADDRESS (OMAP44XX_DMA4_BASE ); + dma_lch_count =OMAP_DMA4_LOGICAL_DMA_CH_COUNT ; }else {pr_err ("DMA init failed for unsupported omap\n" );return -ENODEV ;@@ -2417,7 +2421,7 @@ static int __init omap_init_dma(void) } } -if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) +if (cpu_is_omap2430 () ||cpu_is_omap34xx () ||cpu_is_omap44xx ())omap_dma_set_global_params (DMA_DEFAULT_ARB_RATE ,DMA_DEFAULT_FIFO_DEPTH ,0 );arch/arm/plat-omap/dmtimer.c +33
-1@@ -150,7 +150,8 @@struct omap_dm_timer {unsigned long phys_base;int irq; -#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )struct clk *iclk, *fclk;#endif void __iomem *io_base;@@ -250,6 +251,37 @@ static const char *omap3_dm_source_names[] __initdata = {static struct clk **omap3_dm_source_clocks[2 ];static const int dm_timer_count =ARRAY_SIZE (omap3_dm_timers); +#elif defined(CONFIG_ARCH_OMAP4) + +#define omap_dm_clk_enable (x) clk_enable(x) +#define omap_dm_clk_disable (x) clk_disable(x) +#define omap1_dm_timers NULL +#define omap2_dm_timers NULL +#define omap2_dm_source_names NULL +#define omap2_dm_source_clocks NULL + +static struct omap_dm_timer omap3_dm_timers[] = { + { .phys_base =0x4A318000 , .irq =INT_24XX_GPTIMER1 }, + { .phys_base =0x48032000 , .irq =INT_24XX_GPTIMER2 }, + { .phys_base =0x48034000 , .irq =INT_24XX_GPTIMER3 }, + { .phys_base =0x48036000 , .irq =INT_24XX_GPTIMER4 }, + { .phys_base =0x40138000 , .irq =INT_24XX_GPTIMER5 }, + { .phys_base =0x4013A000 , .irq =INT_24XX_GPTIMER6 }, + { .phys_base =0x4013C000 , .irq =INT_24XX_GPTIMER7 }, + { .phys_base =0x4013E000 , .irq =INT_24XX_GPTIMER8 }, + { .phys_base =0x4803E000 , .irq =INT_24XX_GPTIMER9 }, + { .phys_base =0x48086000 , .irq =INT_24XX_GPTIMER10 }, + { .phys_base =0x48088000 , .irq =INT_24XX_GPTIMER11 }, + { .phys_base =0x4A320000 , .irq =INT_24XX_GPTIMER12 }, +}; +static const char *omap3_dm_source_names[]__initdata = { +"sys_ck" , +"omap_32k_fck" , +NULL +}; +static struct clk **omap3_dm_source_clocks[2 ]; +static const int dm_timer_count =ARRAY_SIZE (omap3_dm_timers); +#else #error OMAP architecture not supported!
arch/arm/plat-omap/dmtimer.c +2
-1@@ -461,7 +493,8 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask) }EXPORT_SYMBOL_GPL (omap_dm_timer_modify_idlect_mask); -#elif defined(CONFIG_ARCH_OMAP2 ) || defined (CONFIG_ARCH_OMAP3 ) +#elif defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )struct clk *omap_dm_timer_get_fclk (struct omap_dm_timer *timer){
arch/arm/plat-omap/dmtimer.c +1
-1@@ -701,7 +734,7 @@ int __init omap_dm_timer_init(void) dm_timers = omap2_dm_timers; dm_source_names = (char **)omap2_dm_source_names; dm_source_clocks = (struct clk **)omap2_dm_source_clocks; - }else if (cpu_is_omap34xx ()) { + }else if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) { dm_timers = omap3_dm_timers; dm_source_names = (char **)omap3_dm_source_names;
dm_source_clocks= (struct clk
**)omap3_dm_source_clocks;arch/arm/plat-omap/dmtimer.c +2
-1@@ -717,7 +750,8 @@ int __init omap_dm_timer_init(void)for (i =0 ; i < dm_timer_count; i++) { timer = &dm_timers[i]; timer->io_base =IO_ADDRESS (timer->phys_base); -#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )if (cpu_class_is_omap2 ()) {char clk_name[16 ];sprintf (clk_name,"gpt%d_ick" , i +1 );arch/arm/plat-omap/gpio.c +13
-3@@ -136,15 +136,24 @@#define OMAP24XX_GPIO_SETDATAOUT 0x0094/* -* omap34xx specific GPIO registers +* omap34xx, omap44xx specific GPIO registers */ +#ifdef CONFIG_ARCH_OMAP4430 +#define OMAP34XX_GPIO1_BASE IO_ADDRESS(0x4A310000) +#define OMAP34XX_GPIO2_BASE IO_ADDRESS(0x48055000) +#define OMAP34XX_GPIO3_BASE IO_ADDRESS(0x48057000) +#define OMAP34XX_GPIO4_BASE IO_ADDRESS(0x48059000) +#define OMAP34XX_GPIO5_BASE IO_ADDRESS(0x4805B000) +#define OMAP34XX_GPIO6_BASE IO_ADDRESS(0x4805D000) +#else #define OMAP34XX_GPIO1_BASE IO_ADDRESS(0x48310000)#define OMAP34XX_GPIO2_BASE IO_ADDRESS(0x49050000)#define OMAP34XX_GPIO3_BASE IO_ADDRESS(0x49052000)#define OMAP34XX_GPIO4_BASE IO_ADDRESS(0x49054000)#define OMAP34XX_GPIO5_BASE IO_ADDRESS(0x49056000)#define OMAP34XX_GPIO6_BASE IO_ADDRESS(0x49058000) +#endif #define OMAP_MPUIO_VBASE IO_ADDRESS(OMAP_MPUIO_BASE)@@ -153,11 +162,13 @@ struct gpio_bank {u16 irq;u16 virtual_irq_start;int method; -#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX ) || \ + defined(CONFIG_ARCH_OMAP34XX ) || defined(CONFIG_ARCH_OMAP44XX )u32 suspend_wakeup;u32 saved_wakeup;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX) ||
defined(CONFIG_ARCH_OMAP34XX)|| \arch/arm/plat-omap/gpio.c +2
-1+defined (CONFIG_ARCH_OMAP44XX) u32 non_wakeup_gpios;u32 enabled_non_wakeup_gpios;@@ -239,7 +250,7 @@ static struct gpio_bank gpio_bank_243x[5] = {#endif -#ifdef CONFIG_ARCH_OMAP34XX +#if defined(CONFIG_ARCH_OMAP34XX ) || defined(CONFIG_ARCH_OMAP44XX )static struct gpio_bank gpio_bank_34xx[6 ] = { {OMAP34XX_GPIO1_BASE ,INT_34XX_GPIO_BANK1 , IH_GPIO_BASE, METHOD_GPIO_24XX },{ OMAP34XX_GPIO2_BASE, INT_34XX_GPIO_BANK2,
IH_GPIO_BASE+ 32,METHOD_GPIO_24XX},arch/arm/plat-omap/gpio.c +2
-0@@ -275,6 +286,8 @@ static inline struct gpio_bank *get_gpio_bank(int gpio)return &gpio_bank[gpio >>5 ];if (cpu_is_omap34xx ())return &gpio_bank[gpio >>5 ]; +if (cpu_is_omap44xx ()) +return &gpio_bank[gpio >>5 ];BUG ();return NULL ;}
arch/arm/plat-omap/gpio.c +6
-1@@ -287,6 +300,8 @@ static inline int get_gpio_index(int gpio)return gpio &0x1f ;if (cpu_is_omap34xx ())return gpio &0x1f ; +if (cpu_is_omap44xx ()) +return gpio &0x1f ;return gpio &0x0f ; }@@ -309,6 +324,8 @@ static inline int gpio_valid(int gpio)return 0 ;if (cpu_is_omap34xx () && gpio <160 )return 0 ; +if (cpu_is_omap44xx () && gpio <160 ) +return 0 ;return -1 ; }@@ -353,7 +370,8 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input) reg += OMAP850_GPIO_DIR_CONTROL;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX :reg += OMAP24XX_GPIO_OE; break;arch/arm/plat-omap/gpio.c +2
-1@@ -425,7 +443,8 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) l &= ~(1 << gpio);break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX :if (enable) reg += OMAP24XX_GPIO_SETDATAOUT;arch/arm/plat-omap/gpio.c +2
-1@@ -476,7 +495,8 @@ static int __omap_get_gpio_datain(int gpio) reg +=OMAP850_GPIO_DATA_INPUT ;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX : reg +=OMAP24XX_GPIO_DATAIN ;break;arch/arm/plat-omap/gpio.c +3
-2@@ -520,7 +540,7 @@ void omap_set_gpio_debounce(int gpio, int enable)else goto done; -if (cpu_is_omap34xx ()) { +if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) {if (enable)clk_enable (bank->dbck);else @@ -550,7 +570,8 @@ void omap_set_gpio_debounce_time(int gpio, int enc_time) }EXPORT_SYMBOL (omap_set_gpio_debounce_time); -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX ) static inline void set_24xx_gpio_triggering(struct gpio_bank*bank, int gpio,
int trigger)
{arch/arm/plat-omap/gpio.c +2
-1@@ -660,7 +681,8 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) goto bad;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX :set_24xx_gpio_triggering(bank, gpio, trigger); break;arch/arm/plat-omap/gpio.c +2
-1@@ -745,7 +767,8 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask) reg += OMAP850_GPIO_INT_STATUS;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX :reg += OMAP24XX_GPIO_IRQSTATUS1; break;arch/arm/plat-omap/gpio.c +2
-1@@ -810,7 +833,8 @@ static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank) inv =1 ;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX :reg += OMAP24XX_GPIO_IRQENABLE1; mask = 0xffffffff;arch/arm/plat-omap/gpio.c +0
-0@@ -883,7 +907,8 @@ static void _enable_gpio_irqbank(struct
gpio_bank*bank, intgpio_mask, int enabl |= gpio_mask; break;#endif
arch/arm/plat-omap/gpio.c +1
-1-#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX) ||
defined(CONFIG_ARCH_OMAP34XX)|| \arch/arm/plat-omap/gpio.c +3
-1+defined (CONFIG_ARCH_OMAP44XX) case METHOD_GPIO_24XX:if (enable) reg +=OMAP24XX_GPIO_SETIRQENABLE1 ;@@ -931,7 +956,8 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable) spin_unlock_irqrestore(&bank->lock, flags);return 0 ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX :if (
bank->non_wakeup_gpios& (1 << gpio)) {
printk(KERN_ERR "Unable to modify wakeup on "arch/arm/plat-omap/gpio.c +2
-1@@ -1019,7 +1045,8 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) __raw_writel(1 << offset, reg); }#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )if (bank->method ==METHOD_GPIO_24XX ) {/* Disable wake-up during idle for dynamic tick */ void __iomem *reg = bank->base +
OMAP24XX_GPIO_CLEARWKUENA;arch/arm/plat-omap/gpio.c +2
-1@@ -1071,7 +1098,8 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)if (bank->method ==METHOD_GPIO_850 ) isr_reg = bank->base +OMAP850_GPIO_INT_STATUS ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )if (bank->method ==METHOD_GPIO_24XX )isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1;#endif
arch/arm/plat-omap/gpio.c +8
-8@@ -1348,7 +1376,7 @@ static int gpio_2irq(struct gpio_chip *chip, unsigned offset)/*------------------------------------------------------------ ---------*/ static int initialized; -#if !defined(CONFIG_ARCH_OMAP3 ) +#if !(defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)) static struct clk * gpio_ick; #endif @@ -1361,7 +1389,7 @@ static struct clk * gpio5_ick;static struct clk * gpio5_fck;#endif -#if defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP3 ) || defined(CONFIG_ARCH_OMAP4 )static struct clk *gpio_iclks[OMAP34XX_NR_GPIOS ];#endif @@ -1421,8 +1449,8 @@ static int __init _omap_gpio_init(void) }#endif -#if defined(CONFIG_ARCH_OMAP3 ) -if (cpu_is_omap34xx ()) { +#if defined(CONFIG_ARCH_OMAP3 ) || defined(CONFIG_ARCH_OMAP4 ) +if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) {for (i =0 ; i <OMAP34XX_NR_GPIOS ; i++) {sprintf (clk_name,"gpio%d_ick" , i +1 ); gpio_iclks[i] =clk_get (NULL , clk_name);@@ -1488,8 +1516,8 @@ static int __init _omap_gpio_init(void) (rev >> 4) & 0x0f, rev & 0x0f); }#endif -#ifdef CONFIG_ARCH_OMAP34XX -if (cpu_is_omap34xx ()) { +#if defined(CONFIG_ARCH_OMAP34XX ) || defined(CONFIG_ARCH_OMAP44XX ) +if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) {int rev; gpio_bank_count =OMAP34XX_NR_GPIOS ;@@ -1522,7 +1550,8 @@ static int __init _omap_gpio_init(void) gpio_count =32 ;/* 730 has 32-bit GPIOs */ } -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ + defined(CONFIG_ARCH_OMAP44XX) if (bank->method == METHOD_GPIO_24XX) { static const u32 non_wakeup_gpios[] = {0xe203ffc0, 0x08700040arch/arm/plat-omap/gpio.c +3
-2@@ -1579,7 +1608,7 @@ static int __init _omap_gpio_init(void)set_irq_chained_handler (bank->irq, gpio_irq_handler);set_irq_data (bank->irq, bank); -if (cpu_is_omap34xx ()) { +if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) {sprintf (clk_name,"gpio%d_dbck" , i +1 ); bank->dbck =clk_get (NULL , clk_name);if (IS_ERR (bank->dbck))@@ -1601,7 +1630,8 @@ static int __init _omap_gpio_init(void)return 0 ; } -#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX ) || \ + defined(CONFIG_ARCH_OMAP34XX ) || defined(CONFIG_ARCH_OMAP44XX )static int omap_gpio_suspend(struct
sys_device*dev,pm_message_tmesg){ int i;arch/arm/plat-omap/gpio.c +2
-1@@ -1624,7 +1654,8 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) wake_set = bank->base +OMAP1610_GPIO_SET_WAKEUPENA ;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX: wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN; wake_clear = bank->base +
OMAP24XX_GPIO_CLEARWKUENA;arch/arm/plat-omap/gpio.c +2
-1@@ -1665,7 +1696,8 @@ static int omap_gpio_resume(struct sys_device *dev) wake_set = bank->base +OMAP1610_GPIO_SET_WAKEUPENA ;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX: wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;arch/arm/plat-omap/gpio.c +4
-2@@ -1697,7 +1729,8 @@ static struct sys_device omap_gpio_device = {#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )static int workaround_enabled;@@ -1713,7 +1746,8 @@ void omap2_gpio_prepare_for_retention(void)if (!(bank->enabled_non_wakeup_gpios))continue ; -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX ) bank->saved_datain =__raw_readl (bank->base +OMAP24XX_GPIO_DATAIN );l1 = __raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT); l2 = __raw_readl(bank->base +
OMAP24XX_GPIO_RISINGDETECT);arch/arm/plat-omap/gpio.c +2
-1@@ -1722,7 +1756,8 @@ void omap2_gpio_prepare_for_retention(void) bank->saved_risingdetect = l2; l1 &= ~bank->enabled_non_wakeup_gpios; l2 &= ~bank->enabled_non_wakeup_gpios; -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )__raw_writel (l1, bank->base +OMAP24XX_GPIO_FALLINGDETECT );__raw_writel(l2, bank->base +
OMAP24XX_GPIO_RISINGDETECT);
#endifarch/arm/plat-omap/gpio.c +2
-1@@ -1747,7 +1782,8 @@ void omap2_gpio_resume_after_retention(void)if (!(bank->enabled_non_wakeup_gpios))continue ; -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX ) __raw_writel(bank->saved_fallingdetect, bank->base +OMAP24XX_GPIO_FALLINGDETECT); __raw_writel(bank->saved_risingdetect,arch/arm/plat-omap/gpio.c +0
-0@@ -1757,14 +1793,16 @@ void omap2_gpio_resume_after_retention(void)* state. If so, generate an IRQ by software. This is * horribly racy, but it's the best we can do to work around
* this silicon bug. */arch/arm/plat-omap/gpio.c +1
-1-#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX) ||
defined(CONFIG_ARCH_OMAP34XX)|| \arch/arm/plat-omap/gpio.c +2
-1+defined (CONFIG_ARCH_OMAP44XX) l =__raw_readl (bank->base +OMAP24XX_GPIO_DATAIN );#endif l ^= bank->saved_datain; l &= bank->non_wakeup_gpios;if (l) {u32 old0, old1; -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX) ||
defined(CONFIG_ARCH_OMAP34XX)|| \
+defined(CONFIG_ARCH_OMAP44XX)old0 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0); old1 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1); __raw_writel(old0 | l, bank->base +
OMAP24XX_GPIO_LEVELDETECT0);arch/arm/plat-omap/gpio.c +2
-1@@ -1800,7 +1838,8 @@ static int __init omap_gpio_sysinit(void)mpuio_init (); -#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX ) || \ + defined(CONFIG_ARCH_OMAP34XX ) || defined(CONFIG_ARCH_OMAP44XX )if (cpu_is_omap16xx() || cpu_class_is_omap2()) { if (ret == 0) { ret =
sysdev_class_register(&omap_gpio_sysclass);arch/arm/plat-omap/gpio.c +1
-1@@ -1889,7 +1928,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused) irqstat = irq_desc[irq].status;#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX ) || \ - defined(CONFIG_ARCH_OMAP34XX ) + defined(CONFIG_ARCH_OMAP34XX ) || defined(CONFIG_ARCH_OMAP44XX )if (is_in && ((bank->suspend_wakeup & mask) || irqstat & IRQ_TYPE_SENSE_MASK)) { char *trigger = NULL;arch/arm/plat-omap/io.c +11
-1@@ -7,6 +7,7 @@#include <mach/omap16xx.h> #include <mach/omap24xx.h> #include <mach/omap34xx.h> +#include <mach/omap44xx.h> #define BETWEEN (p,st,sz) ((p) >= (st) && (p) < ((st) + (sz)))#define XLATE (p,pst,vst) ((void __iomem *)((p) - (pst) + (vst)))@@ -92,7 +93,22 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)return XLATE (p,L4_EMU_34XX_PHYS ,L4_EMU_34XX_VIRT ); }#endif - +#ifdef CONFIG_ARCH_OMAP4 +if (cpu_is_omap44xx ()) { +if (BETWEEN (p,L3_44XX_PHYS ,L3_44XX_SIZE )) +return XLATE (p,L3_44XX_PHYS ,L3_44XX_VIRT ); +if (BETWEEN (p,L4_44XX_PHYS ,L4_44XX_SIZE )) +return XLATE (p,L4_44XX_PHYS ,L4_44XX_VIRT ); +if (BETWEEN (p,L4_WK_44XX_PHYS ,L4_WK_44XX_SIZE )) +return XLATE (p,L4_WK_44XX_PHYS ,L4_WK_44XX_VIRT ); +if (BETWEEN (p,OMAP44XX_GPMC_PHYS ,OMAP44XX_GPMC_SIZE )) + return XLATE(p, OMAP44XX_GPMC_PHYS,
OMAP44XX_GPMC_VIRT);arch/arm/plat-omap/io.c +2
-0+if (BETWEEN (p,L4_PER_44XX_PHYS ,L4_PER_44XX_SIZE )) + return XLATE(p, L4_PER_44XX_PHYS,
L4_PER_44XX_VIRT);arch/arm/plat-omap/io.c +2
-0+if (BETWEEN (p,L4_EMU_44XX_PHYS ,L4_EMU_44XX_SIZE )) + return XLATE(p, L4_EMU_44XX_PHYS,
L4_EMU_44XX_VIRT);arch/arm/plat-omap/io.c +2
-0+ } +#endif return __arm_ioremap (p, size, type); }EXPORT_SYMBOL (omap_ioremap);arch/arm/plat-omap/mux.c +3
-0@@ -54,6 +54,9 @@ int __init_or_module omap_cfg_reg(const unsigned long index) {struct pin_config *reg; +if (cpu_is_omap44xx ()) +return 0 ; +if (mux_cfg ==NULL ) {printk (KERN_ERR "Pin mux table not initialized\n" );return -ENODEV;arch/arm/plat-omap/sram.c +2
-0@@ -44,6 +44,8 @@#define OMAP3_SRAM_VA 0xd7000000#define OMAP3_SRAM_PUB_PA 0x40208000#define OMAP3_SRAM_PUB_VA 0xd7008000 +#define OMAP4_SRAM_PA 0x40200000/*0x402f0000*/ +#define OMAP4_SRAM_VA 0xd7000000/*0xd70f0000*/ #if
defined(CONFIG_ARCH_OMAP24XX)||defined(CONFIG_ARCH_OMAP34XX)
#defineSRAM_BOOTLOADER_SZ0x00arch/arm/plat-omap/sram.c +14
-0@@ -87,6 +89,10 @@ static int is_sram_locked(void) {int type =0 ; +if (cpu_is_omap44xx ()) +/* Not yet supported */ +return 0 ; +if (cpu_is_omap242x ()) type =omap_rev () &OMAP2_DEVICETYPE_MASK ;@@ -135,6 +141,10 @@ void __init omap_detect_sram(void) omap_sram_base =OMAP3_SRAM_VA ; omap_sram_start =OMAP3_SRAM_PA ; omap_sram_size =0x10000 ;/* 64K */ + }else if (cpu_is_omap44xx ()) { + omap_sram_base =OMAP4_SRAM_VA ; + omap_sram_start =OMAP4_SRAM_PA ; + omap_sram_size =0x8000 ;/* 32K */ }else { omap_sram_base =OMAP2_SRAM_VA ; omap_sram_start =OMAP2_SRAM_PA ;@@ -203,6 +213,12 @@ void __init omap_map_sram(void) omap_sram_io_desc[0 ].pfn =__phys_to_pfn (base); } +if (cpu_is_omap44xx ()) { + omap_sram_io_desc[0 ].virtual =OMAP4_SRAM_VA ; + base =OMAP4_SRAM_PA ; + base =ROUND_DOWN (base,PAGE_SIZE ); + omap_sram_io_desc[0 ].pfn =__phys_to_pfn (base); + } omap_sram_io_desc[0 ].length =1024 *1024 ;/* Use section desc */
iotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc));arch/arm/plat-omap/sram.c +4
-1@@ -242,10 +258,12 @@ void * omap_sram_push(void * start, unsigned long size)return (void *)omap_sram_ceil; } +#ifndef CONFIG_ARCH_OMAP4 /* to remove compile time warning */ static void omap_sram_error (void ) {panic ("Uninitialized SRAM function\n" ); } +#endif #ifdef CONFIG_ARCH_OMAP1 @@ -406,6 +424,8 @@ int __init omap_sram_init(void)omap243x_sram_init (); else if (cpu_is_omap34xx()) omap34xx_sram_init(); + else if (cpu_is_omap44xx()) + omap34xx_sram_init(); /* REVISIT: */return 0 ; } --1.5.4.7
--
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
RE: [PATCH 4/7][RFC] OMAP4: Update common omap platform common sources.
Quoted 9 lines
-----Original Message-----
From: Premi, Sanjeev
Sent: Tuesday, April 21, 2009 6:51 PM
To: Shilimkar, Santosh; [email protected]
Cc: Shilimkar, Santosh
Subject: RE: [PATCH 4/7][RFC] OMAP4: Update common omap platform common sources.Any specific reason to use omap2 structures?
These are not actually the omap2 structures. Most of the common omap code uses something like 'omap2_xxxxx_xxx'.
RE: [PATCH 4/7][RFC] OMAP4: Update common omap platform common sources.
-----Original Message-----
Quoted 16 lines
From: [email protected] [mailto:[email protected]] On Behalf Of Shilimkar, Santosh
Sent: Tuesday, April 21, 2009 7:05 PM
To: Premi, Sanjeev; [email protected]
Subject: RE: [PATCH 4/7][RFC] OMAP4: Update common omap platform common sources.Quoted 8 lines
-----Original Message-----
From: Premi, Sanjeev
Sent: Tuesday, April 21, 2009 6:51 PM
To: Shilimkar, Santosh; [email protected]
Cc: Shilimkar, Santosh
Subject: RE: [PATCH 4/7][RFC] OMAP4: Update common omap platform common sources.
Quoted 5 lines
Quoted 1 line
Any specific reason to use omap2 structures?
These are not actually the omap2 structures. Most of the common omap code uses something like '
omap2_xxxxx_xxx'.
Not sure but may be mostly because of the common feautres beteen OMAP2, OMAP3 and now OMAp4 as well. cpu_class_omap2() ==> omap2/omap3/omap4.
Tony Lindgren
maintainerRe: [PATCH 4/7][RFC] OMAP4: Update common omap platform common sources.
In reply to Santosh ShilimkarQuoted 222 lines · Santosh Shilimkar
This patch updates the common platform source files for OMAP4430. Few OMAP4 peripherals are common with OMAP3 architecture.
Signed-off-by Santosh Shilimkar <[email protected]>--- arch/arm/plat-omap/common.c | 29 +++++++++++- arch/arm/plat-omap/devices.c | 2 + arch/arm/plat-omap/dma.c | 10 +++- arch/arm/plat-omap/dmtimer.c | 42 +++++++++++++++-- arch/arm/plat-omap/gpio.c | 109 ++++++++++++++++++++++++++++------------- arch/arm/plat-omap/io.c | 18 +++++++- arch/arm/plat-omap/mux.c | 3 + arch/arm/plat-omap/sram.c | 20 ++++++++ 8 files changed, 189 insertions(+), 44 deletions(-)arch/arm/plat-omap/common.c +28
-1@@ -177,7 +177,8 @@ console_initcall(omap_add_serial_console);#if defined(CONFIG_ARCH_OMAP16XX )#define TIMER_32K_SYNCHRONIZED 0xfffbc410 -#elif defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#elif defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )#define TIMER_32K_SYNCHRONIZED (OMAP2_32KSYNCT_BASE + 0x10)#endif @@ -252,6 +253,16 @@ static void __init __omap2_set_globals(void)#endif +#if defined(CONFIG_ARCH_OMAP4 )/* sdrc and sms are not needed on omap4*/ +static struct omap_globals *omap2_globals; + +static void __init __omap2_set_globals (void ) +{ +omap2_set_globals_tap (omap2_globals); +omap2_set_globals_control (omap2_globals); +} +#endif +#if defined(CONFIG_ARCH_OMAP2420 ) static struct omap_globals omap242x_globals = {@@ -309,3 +320,19 @@ void __init omap2_set_globals_343x(void) }#endif +#if defined(CONFIG_ARCH_OMAP4430 ) +static struct omap_globals omap443x_globals = { + .class =OMAP443X_CLASS , + .tap =OMAP2_IO_ADDRESS (0x4830A000 ), + .ctrl =OMAP2_IO_ADDRESS (OMAP443X_CTRL_BASE ), + .prm =OMAP2_IO_ADDRESS (OMAP4430_PRM_BASE ), + .cm =OMAP2_IO_ADDRESS (OMAP4430_CM_BASE ), +}; + +void __init omap2_set_globals_443x (void ) +{ + omap2_globals = &omap443x_globals; +__omap2_set_globals (); +} +#endif +arch/arm/plat-omap/devices.c +2
-0@@ -311,6 +311,8 @@ static void omap_init_wdt(void) wdt_resources[0 ].start =0x49016000 ;/* WDT2 */ else if (cpu_is_omap343x()) wdt_resources[0].start = 0x48314000; /* WDT2 */ + else if (cpu_is_omap44xx()) + wdt_resources[0].start = 0x4A314000; else return;arch/arm/plat-omap/dma.c +7
-3@@ -852,7 +852,7 @@ omap_dma_set_prio_lch(int lch, unsigned char read_prio, } l =dma_read (CCR (lch)); l &= ~((1 <<6 ) | (1 <<26 )); -if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) +if (cpu_is_omap2430 () ||cpu_is_omap34xx () ||cpu_is_omap44xx ()) l |= ((read_prio &0x1 ) <<6 ) | ((write_prio &0x1 ) <<26 );else l |= ((read_prio &0x1 ) <<6 );@@ -1824,7 +1824,8 @@ static irqreturn_t omap1_dma_irq_handler(int irq, void *dev_id)#define omap1_dma_irq_handler NULL#endif -#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )static int omap2_dma_handle_ch (int ch) {@@ -2319,6 +2320,9 @@ static int __init omap_init_dma(void) }else if (cpu_is_omap34xx ()) { omap_dma_base =IO_ADDRESS (OMAP34XX_DMA4_BASE ); dma_lch_count =OMAP_DMA4_LOGICAL_DMA_CH_COUNT ; + }else if (cpu_is_omap44xx ()) { + omap_dma_base =IO_ADDRESS (OMAP44XX_DMA4_BASE ); + dma_lch_count =OMAP_DMA4_LOGICAL_DMA_CH_COUNT ; }else {pr_err ("DMA init failed for unsupported omap\n" );return -ENODEV ;@@ -2417,7 +2421,7 @@ static int __init omap_init_dma(void) } } -if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) +if (cpu_is_omap2430 () ||cpu_is_omap34xx () ||cpu_is_omap44xx ())omap_dma_set_global_params (DMA_DEFAULT_ARB_RATE ,DMA_DEFAULT_FIFO_DEPTH ,0 );arch/arm/plat-omap/dmtimer.c +38
-4@@ -150,7 +150,8 @@struct omap_dm_timer {unsigned long phys_base;int irq; -#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )struct clk *iclk, *fclk;#endif void __iomem *io_base;@@ -250,6 +251,37 @@ static const char *omap3_dm_source_names[] __initdata = {static struct clk **omap3_dm_source_clocks[2 ];static const int dm_timer_count =ARRAY_SIZE (omap3_dm_timers); +#elif defined(CONFIG_ARCH_OMAP4 ) + +#define omap_dm_clk_enable (x) clk_enable(x) +#define omap_dm_clk_disable (x) clk_disable(x) +#define omap1_dm_timers NULL +#define omap2_dm_timers NULL +#define omap2_dm_source_names NULL +#define omap2_dm_source_clocks NULL + +static struct omap_dm_timer omap3_dm_timers[] = { + { .phys_base =0x4A318000 , .irq =INT_24XX_GPTIMER1 }, + { .phys_base =0x48032000 , .irq =INT_24XX_GPTIMER2 }, + { .phys_base =0x48034000 , .irq =INT_24XX_GPTIMER3 }, + { .phys_base =0x48036000 , .irq =INT_24XX_GPTIMER4 }, + { .phys_base =0x40138000 , .irq =INT_24XX_GPTIMER5 }, + { .phys_base =0x4013A000 , .irq =INT_24XX_GPTIMER6 }, + { .phys_base =0x4013C000 , .irq =INT_24XX_GPTIMER7 }, + { .phys_base =0x4013E000 , .irq =INT_24XX_GPTIMER8 }, + { .phys_base =0x4803E000 , .irq =INT_24XX_GPTIMER9 }, + { .phys_base =0x48086000 , .irq =INT_24XX_GPTIMER10 }, + { .phys_base =0x48088000 , .irq =INT_24XX_GPTIMER11 }, + { .phys_base =0x4A320000 , .irq =INT_24XX_GPTIMER12 }, +}; +static const char *omap3_dm_source_names[]__initdata = { +"sys_ck" , +"omap_32k_fck" , +NULL +}; +static struct clk **omap3_dm_source_clocks[2 ]; +static const int dm_timer_count =ARRAY_SIZE (omap3_dm_timers); +#else #error OMAP architecture not supported!@@ -461,7 +493,8 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask) }EXPORT_SYMBOL_GPL (omap_dm_timer_modify_idlect_mask); -#elif defined(CONFIG_ARCH_OMAP2) || defined (CONFIG_ARCH_OMAP3) +#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ + defined(CONFIG_ARCH_OMAP4)struct clk *omap_dm_timer_get_fclk (struct omap_dm_timer *timer) {@@ -701,7 +734,7 @@ int __init omap_dm_timer_init(void) dm_timers = omap2_dm_timers; dm_source_names = (char **)omap2_dm_source_names; dm_source_clocks = (struct clk **)omap2_dm_source_clocks; - }else if (cpu_is_omap34xx ()) { + }else if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) { dm_timers = omap3_dm_timers; dm_source_names = (char **)omap3_dm_source_names; dm_source_clocks = (struct clk **)omap3_dm_source_clocks;@@ -717,7 +750,8 @@ int __init omap_dm_timer_init(void)for (i =0 ; i < dm_timer_count; i++) { timer = &dm_timers[i]; timer->io_base =IO_ADDRESS (timer->phys_base); -#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )if (cpu_class_is_omap2 ()) {char clk_name[16 ];sprintf (clk_name,"gpt%d_ick" , i +1 );arch/arm/plat-omap/gpio.c +9
-1@@ -136,15 +136,24 @@#define OMAP24XX_GPIO_SETDATAOUT 0x0094/* -* omap34xx specific GPIO registers +* omap34xx, omap44xx specific GPIO registers */ +#ifdef CONFIG_ARCH_OMAP4430 +#define OMAP34XX_GPIO1_BASE IO_ADDRESS(0x4A310000) +#define OMAP34XX_GPIO2_BASE IO_ADDRESS(0x48055000) +#define OMAP34XX_GPIO3_BASE IO_ADDRESS(0x48057000) +#define OMAP34XX_GPIO4_BASE IO_ADDRESS(0x48059000) +#define OMAP34XX_GPIO5_BASE IO_ADDRESS(0x4805B000) +#define OMAP34XX_GPIO6_BASE IO_ADDRESS(0x4805D000) +#else
arch/arm/plat-omap/gpio.c line 159
Quoted 10 lines
arch/arm/plat-omap/gpio.c +1
-0#define OMAP34XX_GPIO1_BASE IO_ADDRESS(0x48310000)#define OMAP34XX_GPIO2_BASE IO_ADDRESS(0x49050000)#define OMAP34XX_GPIO3_BASE IO_ADDRESS(0x49052000)#define OMAP34XX_GPIO4_BASE IO_ADDRESS(0x49054000)#define OMAP34XX_GPIO5_BASE IO_ADDRESS(0x49056000)#define OMAP34XX_GPIO6_BASE IO_ADDRESS(0x49058000) +#endif #define OMAP_MPUIO_VBASE IO_ADDRESS(OMAP_MPUIO_BASE)
Above you should just define separate GPIO banks for omap4, otherwise multi-omap build will break.
Quoted 393 lines
arch/arm/plat-omap/gpio.c +64
-34@@ -153,11 +162,13 @@ struct gpio_bank {u16 irq;u16 virtual_irq_start;int method; -#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX ) || \ + defined(CONFIG_ARCH_OMAP34XX ) || defined(CONFIG_ARCH_OMAP44XX )u32 suspend_wakeup;u32 saved_wakeup;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )u32 non_wakeup_gpios;u32 enabled_non_wakeup_gpios;@@ -239,7 +250,7 @@ static struct gpio_bank gpio_bank_243x[5] = {#endif -#ifdef CONFIG_ARCH_OMAP34XX +#if defined(CONFIG_ARCH_OMAP34XX ) || defined(CONFIG_ARCH_OMAP44XX )static struct gpio_bank gpio_bank_34xx[6 ] = { {OMAP34XX_GPIO1_BASE ,INT_34XX_GPIO_BANK1 ,IH_GPIO_BASE ,METHOD_GPIO_24XX }, { OMAP34XX_GPIO2_BASE, INT_34XX_GPIO_BANK2, IH_GPIO_BASE + 32, METHOD_GPIO_24XX },@@ -275,6 +286,8 @@ static inline struct gpio_bank *get_gpio_bank(int gpio)return &gpio_bank[gpio >>5 ];if (cpu_is_omap34xx ())return &gpio_bank[gpio >>5 ]; +if (cpu_is_omap44xx ()) +return &gpio_bank[gpio >>5 ];BUG ();return NULL ; }@@ -287,6 +300,8 @@ static inline int get_gpio_index(int gpio)return gpio &0x1f ;if (cpu_is_omap34xx ())return gpio &0x1f ; +if (cpu_is_omap44xx ()) +return gpio &0x1f ;return gpio &0x0f ; }@@ -309,6 +324,8 @@ static inline int gpio_valid(int gpio)return 0 ;if (cpu_is_omap34xx () && gpio <160 )return 0 ; +if (cpu_is_omap44xx () && gpio <160 ) +return 0 ;return -1 ; }@@ -353,7 +370,8 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input) reg +=OMAP850_GPIO_DIR_CONTROL ;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX : reg +=OMAP24XX_GPIO_OE ;break ;@@ -425,7 +443,8 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) l &= ~(1 << gpio);break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX :if (enable) reg +=OMAP24XX_GPIO_SETDATAOUT ;@@ -476,7 +495,8 @@ static int __omap_get_gpio_datain(int gpio) reg +=OMAP850_GPIO_DATA_INPUT ;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX : reg +=OMAP24XX_GPIO_DATAIN ;break ;@@ -520,7 +540,7 @@ void omap_set_gpio_debounce(int gpio, int enable)else goto done; -if (cpu_is_omap34xx ()) { +if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) {if (enable)clk_enable (bank->dbck);else @@ -550,7 +570,8 @@ void omap_set_gpio_debounce_time(int gpio, int enc_time) }EXPORT_SYMBOL (omap_set_gpio_debounce_time); -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )static inline void set_24xx_gpio_triggering (struct gpio_bank *bank,int gpio,int trigger) {@@ -660,7 +681,8 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) goto bad;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX :set_24xx_gpio_triggering (bank, gpio, trigger);break ;@@ -745,7 +767,8 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask) reg +=OMAP850_GPIO_INT_STATUS ;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX : reg +=OMAP24XX_GPIO_IRQSTATUS1 ;break ;@@ -810,7 +833,8 @@ static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank) inv =1 ;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX : reg +=OMAP24XX_GPIO_IRQENABLE1 ; mask =0xffffffff ;@@ -883,7 +907,8 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab l |= gpio_mask;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX :if (enable) reg +=OMAP24XX_GPIO_SETIRQENABLE1 ;@@ -931,7 +956,8 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)spin_unlock_irqrestore (&bank->lock, flags);return 0 ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX :if (bank->non_wakeup_gpios & (1 << gpio)) { printk(KERN_ERR "Unable to modify wakeup on "@@ -1019,7 +1045,8 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)__raw_writel (1 << offset, reg); }#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )if (bank->method ==METHOD_GPIO_24XX ) {/* Disable wake-up during idle for dynamic tick */ void __iomem *reg = bank->base +OMAP24XX_GPIO_CLEARWKUENA ;@@ -1071,7 +1098,8 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)if (bank->method ==METHOD_GPIO_850 ) isr_reg = bank->base +OMAP850_GPIO_INT_STATUS ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )if (bank->method ==METHOD_GPIO_24XX ) isr_reg = bank->base +OMAP24XX_GPIO_IRQSTATUS1 ;#endif @@ -1348,7 +1376,7 @@ static int gpio_2irq(struct gpio_chip *chip, unsigned offset)/*---------------------------------------------------------------------*/ static int initialized; -#if !defined(CONFIG_ARCH_OMAP3 ) +#if !(defined(CONFIG_ARCH_OMAP3 ) || defined(CONFIG_ARCH_OMAP4 ))static struct clk * gpio_ick;#endif @@ -1361,7 +1389,7 @@ static struct clk * gpio5_ick;static struct clk * gpio5_fck;#endif -#if defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP3 ) || defined(CONFIG_ARCH_OMAP4 )static struct clk *gpio_iclks[OMAP34XX_NR_GPIOS ];#endif @@ -1421,8 +1449,8 @@ static int __init _omap_gpio_init(void) }#endif -#if defined(CONFIG_ARCH_OMAP3 ) -if (cpu_is_omap34xx ()) { +#if defined(CONFIG_ARCH_OMAP3 ) || defined(CONFIG_ARCH_OMAP4 ) +if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) {for (i =0 ; i <OMAP34XX_NR_GPIOS ; i++) {sprintf (clk_name,"gpio%d_ick" , i +1 ); gpio_iclks[i] =clk_get (NULL , clk_name);@@ -1488,8 +1516,8 @@ static int __init _omap_gpio_init(void) (rev >> 4) & 0x0f, rev & 0x0f); }#endif -#ifdef CONFIG_ARCH_OMAP34XX -if (cpu_is_omap34xx ()) { +#if defined(CONFIG_ARCH_OMAP34XX ) || defined(CONFIG_ARCH_OMAP44XX ) +if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) {int rev; gpio_bank_count =OMAP34XX_NR_GPIOS ;@@ -1522,7 +1550,8 @@ static int __init _omap_gpio_init(void) gpio_count =32 ;/* 730 has 32-bit GPIOs */ } -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ + defined(CONFIG_ARCH_OMAP44XX) if (bank->method == METHOD_GPIO_24XX) { static const u32 non_wakeup_gpios[] = { 0xe203ffc0, 0x08700040@@ -1579,7 +1608,7 @@ static int __init _omap_gpio_init(void)set_irq_chained_handler (bank->irq, gpio_irq_handler);set_irq_data (bank->irq, bank); -if (cpu_is_omap34xx ()) { +if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) {sprintf (clk_name,"gpio%d_dbck" , i +1 ); bank->dbck =clk_get (NULL , clk_name);if (IS_ERR (bank->dbck))@@ -1601,7 +1630,8 @@ static int __init _omap_gpio_init(void)return 0 ; } -#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX ) || \ + defined(CONFIG_ARCH_OMAP34XX ) || defined(CONFIG_ARCH_OMAP44XX )static int omap_gpio_suspend (struct sys_device *dev,pm_message_t mesg) {int i;@@ -1624,7 +1654,8 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) wake_set = bank->base +OMAP1610_GPIO_SET_WAKEUPENA ;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX : wake_status = bank->base +OMAP24XX_GPIO_WAKE_EN ; wake_clear = bank->base +OMAP24XX_GPIO_CLEARWKUENA ;@@ -1665,7 +1696,8 @@ static int omap_gpio_resume(struct sys_device *dev) wake_set = bank->base +OMAP1610_GPIO_SET_WAKEUPENA ;break ;#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )case METHOD_GPIO_24XX : wake_clear = bank->base +OMAP24XX_GPIO_CLEARWKUENA ; wake_set = bank->base +OMAP24XX_GPIO_SETWKUENA ;@@ -1697,7 +1729,8 @@ static struct sys_device omap_gpio_device = {#endif -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )static int workaround_enabled;@@ -1713,7 +1746,8 @@ void omap2_gpio_prepare_for_retention(void)if (!(bank->enabled_non_wakeup_gpios))continue ; -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX ) bank->saved_datain =__raw_readl (bank->base +OMAP24XX_GPIO_DATAIN ); l1 =__raw_readl (bank->base +OMAP24XX_GPIO_FALLINGDETECT ); l2 =__raw_readl (bank->base +OMAP24XX_GPIO_RISINGDETECT );@@ -1722,7 +1756,8 @@ void omap2_gpio_prepare_for_retention(void) bank->saved_risingdetect = l2; l1 &= ~bank->enabled_non_wakeup_gpios; l2 &= ~bank->enabled_non_wakeup_gpios; -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )__raw_writel (l1, bank->base +OMAP24XX_GPIO_FALLINGDETECT );__raw_writel (l2, bank->base +OMAP24XX_GPIO_RISINGDETECT );#endif @@ -1747,7 +1782,8 @@ void omap2_gpio_resume_after_retention(void)if (!(bank->enabled_non_wakeup_gpios))continue ; -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX )__raw_writel (bank->saved_fallingdetect, bank->base +OMAP24XX_GPIO_FALLINGDETECT ); __raw_writel(bank->saved_risingdetect,@@ -1757,14 +1793,16 @@ void omap2_gpio_resume_after_retention(void)* state. If so, generate an IRQ by software. This is * horribly racy, but it's the best we can do to work around * this silicon bug. */ -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX ) l =__raw_readl (bank->base +OMAP24XX_GPIO_DATAIN );#endif l ^= bank->saved_datain; l &= bank->non_wakeup_gpios;if (l) {u32 old0, old1; -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) || \ + defined(CONFIG_ARCH_OMAP44XX ) old0 =__raw_readl (bank->base +OMAP24XX_GPIO_LEVELDETECT0 ); old1 =__raw_readl (bank->base +OMAP24XX_GPIO_LEVELDETECT1 );__raw_writel (old0 | l, bank->base +OMAP24XX_GPIO_LEVELDETECT0 );@@ -1800,7 +1838,8 @@ static int __init omap_gpio_sysinit(void)mpuio_init (); -#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX ) || \ + defined(CONFIG_ARCH_OMAP34XX ) || defined(CONFIG_ARCH_OMAP44XX )if (cpu_is_omap16xx () ||cpu_class_is_omap2 ()) {if (ret ==0 ) { ret =sysdev_class_register (&omap_gpio_sysclass);@@ -1889,7 +1928,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused) irqstat = irq_desc[irq].status;#if defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP24XX ) || \ - defined(CONFIG_ARCH_OMAP34XX ) + defined(CONFIG_ARCH_OMAP34XX ) || defined(CONFIG_ARCH_OMAP44XX )if (is_in && ((bank->suspend_wakeup & mask) || irqstat &IRQ_TYPE_SENSE_MASK )) {char *trigger =NULL ;arch/arm/plat-omap/io.c +17
-1@@ -7,6 +7,7 @@#include <mach/omap16xx.h> #include <mach/omap24xx.h> #include <mach/omap34xx.h> +#include <mach/omap44xx.h> #define BETWEEN (p,st,sz) ((p) >= (st) && (p) < ((st) + (sz)))#define XLATE (p,pst,vst) ((void __iomem *)((p) - (pst) + (vst)))@@ -92,7 +93,22 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)return XLATE (p,L4_EMU_34XX_PHYS ,L4_EMU_34XX_VIRT ); }#endif - +#ifdef CONFIG_ARCH_OMAP4 +if (cpu_is_omap44xx ()) { +if (BETWEEN (p,L3_44XX_PHYS ,L3_44XX_SIZE )) +return XLATE (p,L3_44XX_PHYS ,L3_44XX_VIRT ); +if (BETWEEN (p,L4_44XX_PHYS ,L4_44XX_SIZE )) +return XLATE (p,L4_44XX_PHYS ,L4_44XX_VIRT ); +if (BETWEEN (p,L4_WK_44XX_PHYS ,L4_WK_44XX_SIZE )) +return XLATE (p,L4_WK_44XX_PHYS ,L4_WK_44XX_VIRT ); +if (BETWEEN (p,OMAP44XX_GPMC_PHYS ,OMAP44XX_GPMC_SIZE )) +return XLATE (p,OMAP44XX_GPMC_PHYS ,OMAP44XX_GPMC_VIRT ); +if (BETWEEN (p,L4_PER_44XX_PHYS ,L4_PER_44XX_SIZE )) +return XLATE (p,L4_PER_44XX_PHYS ,L4_PER_44XX_VIRT ); +if (BETWEEN (p,L4_EMU_44XX_PHYS ,L4_EMU_44XX_SIZE )) +return XLATE (p,L4_EMU_44XX_PHYS ,L4_EMU_44XX_VIRT ); + } +#endif return __arm_ioremap (p, size, type); }EXPORT_SYMBOL (omap_ioremap);arch/arm/plat-omap/mux.c +3
-0@@ -54,6 +54,9 @@ int __init_or_module omap_cfg_reg(const unsigned long index) {struct pin_config *reg; +if (cpu_is_omap44xx ()) +return 0 ; +if (mux_cfg ==NULL ) {printk (KERN_ERR "Pin mux table not initialized\n" );return -ENODEV ;arch/arm/plat-omap/sram.c +0
-0
arch/arm/plat-omap/sram.c line 48
Quoted 5 lines
arch/arm/plat-omap/sram.c +2
-0@@ -44,6 +44,8 @@#define OMAP3_SRAM_VA 0xd7000000#define OMAP3_SRAM_PUB_PA 0x40208000#define OMAP3_SRAM_PUB_VA 0xd7008000 +#define OMAP4_SRAM_PA 0x40200000/*0x402f0000*/ +#define OMAP4_SRAM_VA 0xd7000000/*0xd70f0000*/
Please add spaces around the comments above, like /* 0xd70f0000 */.
Quoted 39 lines
arch/arm/plat-omap/sram.c +14
-0#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX )#define SRAM_BOOTLOADER_SZ 0x00@@ -87,6 +89,10 @@ static int is_sram_locked(void) {int type =0 ; +if (cpu_is_omap44xx ()) +/* Not yet supported */ +return 0 ; +if (cpu_is_omap242x ()) type =omap_rev () &OMAP2_DEVICETYPE_MASK ;@@ -135,6 +141,10 @@ void __init omap_detect_sram(void) omap_sram_base =OMAP3_SRAM_VA ; omap_sram_start =OMAP3_SRAM_PA ; omap_sram_size =0x10000 ;/* 64K */ + }else if (cpu_is_omap44xx ()) { + omap_sram_base =OMAP4_SRAM_VA ; + omap_sram_start =OMAP4_SRAM_PA ; + omap_sram_size =0x8000 ;/* 32K */ }else { omap_sram_base =OMAP2_SRAM_VA ; omap_sram_start =OMAP2_SRAM_PA ;@@ -203,6 +213,12 @@ void __init omap_map_sram(void) omap_sram_io_desc[0 ].pfn =__phys_to_pfn (base); } +if (cpu_is_omap44xx ()) { + omap_sram_io_desc[0 ].virtual =OMAP4_SRAM_VA ; + base =OMAP4_SRAM_PA ; + base =ROUND_DOWN (base,PAGE_SIZE ); + omap_sram_io_desc[0 ].pfn =__phys_to_pfn (base); + } omap_sram_io_desc[0 ].length =1024 *1024 ;/* Use section desc */ iotable_init (omap_sram_io_desc,ARRAY_SIZE (omap_sram_io_desc));
arch/arm/plat-omap/sram.c void * omap_sram_push(void * start, unsigned long size) · line 266
Quoted 9 lines
arch/arm/plat-omap/sram.c +2
-0@@ -242,10 +258,12 @@ void * omap_sram_push(void * start, unsigned long size)return (void *)omap_sram_ceil; } +#ifndef CONFIG_ARCH_OMAP4 /* to remove compile time warning */ static void omap_sram_error (void ) {panic ("Uninitialized SRAM function\n" ); } +#endif
How about just add something like this instead of the ifndef?
if (cpu_is_omap44xx())
return;
Then add a REVISIT comment there so we'll remember to remove it later :)
Quoted 18 lines
arch/arm/plat-omap/sram.c +2
-0#ifdef CONFIG_ARCH_OMAP1 @@ -406,6 +424,8 @@ int __init omap_sram_init(void)omap243x_sram_init (); else if (cpu_is_omap34xx()) omap34xx_sram_init(); + else if (cpu_is_omap44xx()) + omap34xx_sram_init(); /* REVISIT: */return 0 ; }Signature · 6 lines
1.5.4.7 -- 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
Tony Lindgren
maintainerRe: [PATCH 3/7][RFC] OMAP4: Update common omap platform headers.
In reply to Santosh ShilimkarQuoted 258 lines · Santosh Shilimkar
This patch updates the common platform headers files for OMAP4430. On OMAP4, GIC is used instead of INTC, hence all the private peripheral interrupts are shifted by an offset of 32. So if the hardcoding is not done for IRQ lines in drivers, then this change won't impact any driver.
Signed-off-by Santosh Shilimkar <[email protected]>--- arch/arm/plat-omap/include/mach/common.h | 1 + arch/arm/plat-omap/include/mach/control.h | 3 +- arch/arm/plat-omap/include/mach/debug-macro.S | 2 +- arch/arm/plat-omap/include/mach/dma.h | 1 + arch/arm/plat-omap/include/mach/entry-macro.S | 45 +++++- arch/arm/plat-omap/include/mach/io.h | 34 ++++ arch/arm/plat-omap/include/mach/irqs.h | 205 +++++++++++++------------ arch/arm/plat-omap/include/mach/memory.h | 3 +- arch/arm/plat-omap/include/mach/serial.h | 11 ++- arch/arm/plat-omap/include/mach/system.h | 7 + 10 files changed, 206 insertions(+), 106 deletions(-)arch/arm/plat-omap/include/mach/common.h +1
-0@@ -62,6 +62,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_443x (void );/* These get called from omap2_set_globals_xxxx(), do not call these */ void omap2_set_globals_tap (struct omap_globals *);arch/arm/plat-omap/include/mach/control.h +2
-1@@ -190,7 +190,8 @@#define OMAP2_PBIASLITEVMODE0 (1 << 0)#ifndef __ASSEMBLY__ -#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )extern void __iomem *omap_ctrl_base_get (void );extern u8 omap_ctrl_readb (u16 offset);extern u16 omap_ctrl_readw (u16 offset);arch/arm/plat-omap/include/mach/debug-macro.S +1
-1@@ -36,7 +36,7 @@ add \rx, \rx, #0x00004000 @ UART 3 #endif -#elif CONFIG_ARCH_OMAP3 +#elif (CONFIG_ARCH_OMAP3 || CONFIG_ARCH_OMAP4) moveq \rx, #0x48000000 @ physical base address movne \rx, #0xd8000000 @ virtual base orr \rx, \rx, #0x0006a000arch/arm/plat-omap/include/mach/dma.h +1
-0@@ -48,6 +48,7 @@/* Hardware registers for omap2 and omap3 */ #define OMAP24XX_DMA4_BASE (L4_24XX_BASE + 0x56000)#define OMAP34XX_DMA4_BASE (L4_34XX_BASE + 0x56000) +#define OMAP44XX_DMA4_BASE (L4_44XX_BASE + 0x56000)#define OMAP_DMA4_REVISION 0x00#define OMAP_DMA4_GCR 0x78arch/arm/plat-omap/include/mach/entry-macro.S +43
-2@@ -10,6 +10,9 @@ #include <mach/hardware.h> #include <mach/io.h> #include <mach/irqs.h> +#ifdef CONFIG_ARCH_OMAP44XX +#include <asm/hardware/gic.h> +#endif #if defined(CONFIG_ARCH_OMAP1)@@ -56,7 +59,8 @@ .endm #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ + defined(CONFIG_ARCH_OMAP44XX) #if defined(CONFIG_ARCH_OMAP24XX) #include <mach/omap24xx.h>@@ -64,7 +68,9 @@ #if defined(CONFIG_ARCH_OMAP34XX) #include <mach/omap34xx.h> #endif - +#if defined(CONFIG_ARCH_OMAP44XX) +#include <mach/omap44xx.h> +#endif #define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt offset */ #define ACTIVEIRQ_MASK 0x7f /* Active interrupt bits */@@ -77,6 +83,7 @@ .macro arch_ret_to_user, tmp1, tmp2 .endm +#ifndef CONFIG_ARCH_OMAP44XX .macro get_irqnr_and_base, irqnr, irqstat, base, tmp ldr \base, =OMAP2_VA_IC_BASE ldr \irqnr, [\base, #0x98] /* IRQ pending reg 1 */@@ -92,6 +99,40 @@ and \irqnr, \irqnr, #ACTIVEIRQ_MASK /* Clear spurious bits */ .endm +#else + /* + * The interrupt numbering scheme is defined in the + * interrupt controller spec. To wit: + * + * Interrupts 0-15 are IPI + * 16-28 are reserved + * 29-31 are local. We allow 30 to be used for the watchdog. + * 32-1020 are global + * 1021-1022 are reserved + * 1023 is "spurious" (no interrupt) + * + * For now, we ignore all local interrupts so only return an + * interrupt if it's between 30 and 1020. The test_for_ipi + * routine below will pick up on IPIs. + * A simple read from the controller will tell us the number + * of the highest priority enabled interrupt. + * We then just need to check whether it is in the + * valid range for an IRQ (30-1020 inclusive). + */ + .macro get_irqnr_and_base, irqnr, irqstat, base, tmp + ldr \base, =OMAP44XX_VA_GIC_CPU_BASE + ldr \irqstat, [\base, #GIC_CPU_INTACK] + + ldr \tmp, =1021 + + bic \irqnr, \irqstat, #0x1c00 + + cmp \irqnr, #29 + cmpcc \irqnr, \irqnr + cmpne \irqnr, \tmp + cmpcs \irqnr, \irqnr + .endm +#endif .macro irq_prio_table .endmarch/arm/plat-omap/include/mach/io.h +34
-0@@ -157,6 +157,40 @@#define DSP_MMU_34XX_VIRT 0xe2000000#define DSP_MMU_34XX_SIZE SZ_4K + +#elif defined(CONFIG_ARCH_OMAP4 ) +/* We map both L3 and L4 on OMAP4 */ +#define L3_44XX_PHYS L3_44XX_BASE +#define L3_44XX_VIRT 0xd4000000 +#define L3_44XX_SIZE SZ_1M + +#define L4_44XX_PHYS L4_44XX_BASE +#define L4_44XX_VIRT 0xda000000 +#define L4_44XX_SIZE SZ_4M + + +#define L4_WK_44XX_PHYS L4_WK_44XX_BASE +#define L4_WK_44XX_VIRT 0xda300000 +#define L4_WK_44XX_SIZE SZ_1M + +#define L4_PER_44XX_PHYS L4_PER_44XX_BASE +#define L4_PER_44XX_VIRT 0xd8000000 +#define L4_PER_44XX_SIZE SZ_4M + +#define L4_EMU_44XX_PHYS L4_EMU_44XX_BASE +#define L4_EMU_44XX_VIRT 0xe4000000 +#define L4_EMU_44XX_SIZE SZ_64M + +#define OMAP44XX_GPMC_PHYS OMAP44XX_GPMC_BASE +#define OMAP44XX_GPMC_VIRT 0xe0000000 +#define OMAP44XX_GPMC_SIZE SZ_1M + + +#define IO_OFFSET 0x90000000 +#define __IO_ADDRESS (pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ +#define __OMAP2_IO_ADDRESS (pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ +#define io_v2p (va) ((va) - IO_OFFSET)/* Works for L3 and L4 */ +#endif #define IO_ADDRESS (pa) IOMEM(__IO_ADDRESS(pa))arch/arm/plat-omap/include/mach/irqs.h +0
-51@@ -318,109 +318,114 @@#define INT_850_DMA_CH15 (62 + IH2_BASE)#define INT_850_NAND (63 + IH2_BASE) -#define INT_24XX_SYS_NIRQ 7 -#define INT_24XX_SDMA_IRQ0 12 -#define INT_24XX_SDMA_IRQ1 13 -#define INT_24XX_SDMA_IRQ2 14 -#define INT_24XX_SDMA_IRQ3 15 -#define INT_24XX_CAM_IRQ 24 -#define INT_24XX_DSS_IRQ 25 -#define INT_24XX_MAIL_U0_MPU 26 -#define INT_24XX_DSP_UMA 27 -#define INT_24XX_DSP_MMU 28 -#define INT_24XX_GPIO_BANK1 29 -#define INT_24XX_GPIO_BANK2 30 -#define INT_24XX_GPIO_BANK3 31 -#define INT_24XX_GPIO_BANK4 32 -#define INT_24XX_GPIO_BANK5 33 -#define INT_24XX_MAIL_U3_MPU 34 -#define INT_24XX_GPTIMER1 37 -#define INT_24XX_GPTIMER2 38 -#define INT_24XX_GPTIMER3 39 -#define INT_24XX_GPTIMER4 40 -#define INT_24XX_GPTIMER5 41 -#define INT_24XX_GPTIMER6 42 -#define INT_24XX_GPTIMER7 43 -#define INT_24XX_GPTIMER8 44 -#define INT_24XX_GPTIMER9 45 -#define INT_24XX_GPTIMER10 46 -#define INT_24XX_GPTIMER11 47 -#define INT_24XX_GPTIMER12 48 -#define INT_24XX_SHA1MD5 51 -#define INT_24XX_MCBSP4_IRQ_TX 54 -#define INT_24XX_MCBSP4_IRQ_RX 55 -#define INT_24XX_I2C1_IRQ 56 -#define INT_24XX_I2C2_IRQ 57 -#define INT_24XX_HDQ_IRQ 58 -#define INT_24XX_MCBSP1_IRQ_TX 59 -#define INT_24XX_MCBSP1_IRQ_RX 60 -#define INT_24XX_MCBSP2_IRQ_TX 62 -#define INT_24XX_MCBSP2_IRQ_RX 63 -#define INT_24XX_SPI1_IRQ 65 -#define INT_24XX_SPI2_IRQ 66 -#define INT_24XX_UART1_IRQ 72 -#define INT_24XX_UART2_IRQ 73 -#define INT_24XX_UART3_IRQ 74 -#define INT_24XX_USB_IRQ_GEN 75 -#define INT_24XX_USB_IRQ_NISO 76 -#define INT_24XX_USB_IRQ_ISO 77 -#define INT_24XX_USB_IRQ_HGEN 78 -#define INT_24XX_USB_IRQ_HSOF 79 -#define INT_24XX_USB_IRQ_OTG 80 -#define INT_24XX_MCBSP5_IRQ_TX 81 -#define INT_24XX_MCBSP5_IRQ_RX 82
arch/arm/plat-omap/include/mach/irqs.h line 325
Quoted 10 lines
arch/arm/plat-omap/include/mach/irqs.h +5
-5-#define INT_24XX_MMC_IRQ 83 -#define INT_24XX_MMC2_IRQ 86 -#define INT_24XX_MCBSP3_IRQ_TX 89 -#define INT_24XX_MCBSP3_IRQ_RX 90 -#define INT_24XX_SPI3_IRQ 91 +#ifdef CONFIG_ARCH_OMAP4 +#define IRQ_GIC_START 32 +#else +#define IRQ_GIC_START 0 +#endif
This ifdef we don't want to do as it blocks the compile for multi-omap.
Quoted 136 lines
arch/arm/plat-omap/include/mach/irqs.h +90
-44-#define INT_243X_MCBSP2_IRQ 16 -#define INT_243X_MCBSP3_IRQ 17 -#define INT_243X_MCBSP4_IRQ 18 -#define INT_243X_MCBSP5_IRQ 19 -#define INT_243X_MCBSP1_IRQ 64 -#define INT_243X_HS_USB_MC 92 -#define INT_243X_HS_USB_DMA 93 -#define INT_243X_CARKIT_IRQ 94 +#define INT_24XX_SYS_NIRQ (7 + IRQ_GIC_START) +#define INT_24XX_SDMA_IRQ0 (12 + IRQ_GIC_START) +#define INT_24XX_SDMA_IRQ1 (13 + IRQ_GIC_START) +#define INT_24XX_SDMA_IRQ2 (14 + IRQ_GIC_START) +#define INT_24XX_SDMA_IRQ3 (15 + IRQ_GIC_START) +#define INT_24XX_CAM_IRQ (24 + IRQ_GIC_START) +#define INT_24XX_DSS_IRQ (25 + IRQ_GIC_START) +#define INT_24XX_MAIL_U0_MPU (26 + IRQ_GIC_START) +#define INT_24XX_DSP_UMA (27 + IRQ_GIC_START) +#define INT_24XX_DSP_MMU (28 + IRQ_GIC_START) +#define INT_24XX_GPIO_BANK1 (29 + IRQ_GIC_START) +#define INT_24XX_GPIO_BANK2 (30 + IRQ_GIC_START) +#define INT_24XX_GPIO_BANK3 (31 + IRQ_GIC_START) +#define INT_24XX_GPIO_BANK4 (32 + IRQ_GIC_START) +#define INT_24XX_GPIO_BANK5 (33 + IRQ_GIC_START) +#define INT_24XX_MAIL_U3_MPU (34 + IRQ_GIC_START) +#define INT_24XX_GPTIMER1 (37 + IRQ_GIC_START) +#define INT_24XX_GPTIMER2 (38 + IRQ_GIC_START) +#define INT_24XX_GPTIMER3 (39 + IRQ_GIC_START) +#define INT_24XX_GPTIMER4 (40 + IRQ_GIC_START) +#define INT_24XX_GPTIMER5 (41 + IRQ_GIC_START) +#define INT_24XX_GPTIMER6 (42 + IRQ_GIC_START) +#define INT_24XX_GPTIMER7 (43 + IRQ_GIC_START) +#define INT_24XX_GPTIMER8 (44 + IRQ_GIC_START) +#define INT_24XX_GPTIMER9 (45 + IRQ_GIC_START) +#define INT_24XX_GPTIMER10 (46 + IRQ_GIC_START) +#define INT_24XX_GPTIMER11 (47 + IRQ_GIC_START) +#define INT_24XX_GPTIMER12 (48 + IRQ_GIC_START) +#define INT_24XX_SHA1MD5 (51 + IRQ_GIC_START) +#define INT_24XX_MCBSP4_IRQ_TX (54 + IRQ_GIC_START) +#define INT_24XX_MCBSP4_IRQ_RX (55 + IRQ_GIC_START) +#define INT_24XX_I2C1_IRQ (56 + IRQ_GIC_START) +#define INT_24XX_I2C2_IRQ (57 + IRQ_GIC_START) +#define INT_24XX_HDQ_IRQ (58 + IRQ_GIC_START) +#define INT_24XX_MCBSP1_IRQ_TX (59 + IRQ_GIC_START) +#define INT_24XX_MCBSP1_IRQ_RX (60 + IRQ_GIC_START) +#define INT_24XX_MCBSP2_IRQ_TX (62 + IRQ_GIC_START) +#define INT_24XX_MCBSP2_IRQ_RX (63 + IRQ_GIC_START) +#define INT_24XX_SPI1_IRQ (65 + IRQ_GIC_START) +#define INT_24XX_SPI2_IRQ (66 + IRQ_GIC_START) +#define INT_24XX_UART1_IRQ (72 + IRQ_GIC_START) +#define INT_24XX_UART2_IRQ (73 + IRQ_GIC_START) +#define INT_24XX_UART3_IRQ (74 + IRQ_GIC_START) +#define INT_24XX_USB_IRQ_GEN (75 + IRQ_GIC_START) +#define INT_24XX_USB_IRQ_NISO (76 + IRQ_GIC_START) +#define INT_24XX_USB_IRQ_ISO (77 + IRQ_GIC_START) +#define INT_24XX_USB_IRQ_HGEN (78 + IRQ_GIC_START) +#define INT_24XX_USB_IRQ_HSOF (79 + IRQ_GIC_START) +#define INT_24XX_USB_IRQ_OTG (80 + IRQ_GIC_START) +#define INT_24XX_MCBSP5_IRQ_TX (81 + IRQ_GIC_START) +#define INT_24XX_MCBSP5_IRQ_RX (82 + IRQ_GIC_START) +#define INT_24XX_MMC_IRQ (83 + IRQ_GIC_START) +#define INT_24XX_MMC2_IRQ (86 + IRQ_GIC_START) +#define INT_24XX_MCBSP3_IRQ_TX (89 + IRQ_GIC_START) +#define INT_24XX_MCBSP3_IRQ_RX (90 + IRQ_GIC_START) +#define INT_24XX_SPI3_IRQ (91 + IRQ_GIC_START) -#define INT_34XX_BENCH_MPU_EMUL 3 -#define INT_34XX_ST_MCBSP2_IRQ 4 -#define INT_34XX_ST_MCBSP3_IRQ 5 -#define INT_34XX_SSM_ABORT_IRQ 6 -#define INT_34XX_SYS_NIRQ 7 -#define INT_34XX_D2D_FW_IRQ 8 -#define INT_34XX_PRCM_MPU_IRQ 11 -#define INT_34XX_MCBSP1_IRQ 16 -#define INT_34XX_MCBSP2_IRQ 17 -#define INT_34XX_MCBSP3_IRQ 22 -#define INT_34XX_MCBSP4_IRQ 23 -#define INT_34XX_CAM_IRQ 24 -#define INT_34XX_MCBSP5_IRQ 27 -#define INT_34XX_GPIO_BANK1 29 -#define INT_34XX_GPIO_BANK2 30 -#define INT_34XX_GPIO_BANK3 31 -#define INT_34XX_GPIO_BANK4 32 -#define INT_34XX_GPIO_BANK5 33 -#define INT_34XX_GPIO_BANK6 34 -#define INT_34XX_USIM_IRQ 35 -#define INT_34XX_WDT3_IRQ 36 -#define INT_34XX_SPI4_IRQ 48 -#define INT_34XX_SHA1MD52_IRQ 49 -#define INT_34XX_FPKA_READY_IRQ 50 -#define INT_34XX_SHA1MD51_IRQ 51 -#define INT_34XX_RNG_IRQ 52 -#define INT_34XX_I2C3_IRQ 61 -#define INT_34XX_FPKA_ERROR_IRQ 64 -#define INT_34XX_PBIAS_IRQ 75 -#define INT_34XX_OHCI_IRQ 76 -#define INT_34XX_EHCI_IRQ 77 -#define INT_34XX_TLL_IRQ 78 -#define INT_34XX_PARTHASH_IRQ 79 -#define INT_34XX_MMC3_IRQ 94 -#define INT_34XX_GPT12_IRQ 95 +#define INT_243X_MCBSP2_IRQ (16 + IRQ_GIC_START) +#define INT_243X_MCBSP3_IRQ (17 + IRQ_GIC_START) +#define INT_243X_MCBSP4_IRQ (18 + IRQ_GIC_START) +#define INT_243X_MCBSP5_IRQ (19 + IRQ_GIC_START) +#define INT_243X_MCBSP1_IRQ (64 + IRQ_GIC_START) +#define INT_243X_HS_USB_MC (92 + IRQ_GIC_START) +#define INT_243X_HS_USB_DMA (93 + IRQ_GIC_START) +#define INT_243X_CARKIT_IRQ (94 + IRQ_GIC_START) -#define INT_34XX_BENCH_MPU_EMUL 3 +#define INT_34XX_BENCH_MPU_EMUL (3 + IRQ_GIC_START) +#define INT_34XX_ST_MCBSP2_IRQ (4 + IRQ_GIC_START) +#define INT_34XX_ST_MCBSP3_IRQ (5 + IRQ_GIC_START) +#define INT_34XX_SSM_ABORT_IRQ (6 + IRQ_GIC_START) +#define INT_34XX_SYS_NIRQ (7 + IRQ_GIC_START) +#define INT_34XX_D2D_FW_IRQ (8 + IRQ_GIC_START) +#define INT_34XX_PRCM_MPU_IRQ (11 + IRQ_GIC_START) +#define INT_34XX_MCBSP1_IRQ (16 + IRQ_GIC_START) +#define INT_34XX_MCBSP2_IRQ (17 + IRQ_GIC_START) +#define INT_34XX_MCBSP3_IRQ (22 + IRQ_GIC_START) +#define INT_34XX_MCBSP4_IRQ (23 + IRQ_GIC_START) +#define INT_34XX_CAM_IRQ (24 + IRQ_GIC_START) +#define INT_34XX_MCBSP5_IRQ (27 + IRQ_GIC_START) +#define INT_34XX_GPIO_BANK1 (29 + IRQ_GIC_START) +#define INT_34XX_GPIO_BANK2 (30 + IRQ_GIC_START) +#define INT_34XX_GPIO_BANK3 (31 + IRQ_GIC_START) +#define INT_34XX_GPIO_BANK4 (32 + IRQ_GIC_START) +#define INT_34XX_GPIO_BANK5 (33 + IRQ_GIC_START) +#define INT_34XX_GPIO_BANK6 (34 + IRQ_GIC_START) +#define INT_34XX_USIM_IRQ (35 + IRQ_GIC_START) +#define INT_34XX_WDT3_IRQ (36 + IRQ_GIC_START) +#define INT_34XX_SPI4_IRQ (48 + IRQ_GIC_START) +#define INT_34XX_SHA1MD52_IRQ (49 + IRQ_GIC_START) +#define INT_34XX_FPKA_READY_IRQ (50 + IRQ_GIC_START) +#define INT_34XX_SHA1MD51_IRQ (51 + IRQ_GIC_START) +#define INT_34XX_RNG_IRQ (52 + IRQ_GIC_START)
arch/arm/plat-omap/include/mach/irqs.h line 428
Quoted 10 lines
arch/arm/plat-omap/include/mach/irqs.h +10
-0+#define INT_34XX_I2C3_IRQ (61 + IRQ_GIC_START) +#define INT_34XX_FPKA_ERROR_IRQ (64 + IRQ_GIC_START) +#define INT_34XX_PBIAS_IRQ (75 + IRQ_GIC_START) +#define INT_34XX_OHCI_IRQ (76 + IRQ_GIC_START) +#define INT_34XX_EHCI_IRQ (77 + IRQ_GIC_START) +#define INT_34XX_TLL_IRQ (78 + IRQ_GIC_START) +#define INT_34XX_PARTHASH_IRQ (79 + IRQ_GIC_START) +#define INT_34XX_MMC3_IRQ (94 + IRQ_GIC_START) +#define INT_34XX_GPT12_IRQ (95 + IRQ_GIC_START) +#define INT_44XX_SPI5_IRQ (69 + IRQ_GIC_START)
How about just add extra + 32 to the omap4 specific defines? Something like this maybe:
#define OMAP4_GIC_OFFSET 32
#define INT_44XX_SP15_IRQ (69 + IRQ_GIC_START + OMAP4_GIC_OFFSET)
It's OK to define the numbers separately for each processors:
#define INT_34XX_TLL_IRQ (78 + IRQ_GIC_START)
...
#define INT_44XX_TLL_IRQ (78 + IRQ_GIC_START + OMAP4_GIC_OFFSET)
Quoted 41 lines
arch/arm/plat-omap/include/mach/irqs.h +0
-0/* Max. 128 level 2 IRQs (OMAP1610), 192 GPIOs (OMAP730/850) and * 16 MPUIO lines */ arch/arm/plat-omap/include/mach/memory.h +2
-1@@ -38,7 +38,8 @@*/ #if defined(CONFIG_ARCH_OMAP1 )#define PHYS_OFFSET UL(0x10000000) -#elif defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#elif defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )#define PHYS_OFFSET UL(0x80000000)#endif arch/arm/plat-omap/include/mach/serial.h +6
-0@@ -15,19 +15,28 @@#define OMAP_UART1_BASE 0xfffb0000#define OMAP_UART2_BASE 0xfffb0800#define OMAP_UART3_BASE 0xfffb9800 +#define OMAP_MAX_NR_PORTS 3#elif defined(CONFIG_ARCH_OMAP2 )/* OMAP2 serial ports */ #define OMAP_UART1_BASE 0x4806a000#define OMAP_UART2_BASE 0x4806c000#define OMAP_UART3_BASE 0x4806e000 +#define OMAP_MAX_NR_PORTS 3#elif defined(CONFIG_ARCH_OMAP3 )/* OMAP3 serial ports */ #define OMAP_UART1_BASE 0x4806a000#define OMAP_UART2_BASE 0x4806c000#define OMAP_UART3_BASE 0x49020000 +#define OMAP_MAX_NR_PORTS 3 +#elif defined(CONFIG_ARCH_OMAP4 ) +/* OMAP4 serial ports */ +#define OMAP_UART1_BASE 0x4806a000
arch/arm/plat-omap/include/mach/serial.h line 42
Quoted 10 lines
arch/arm/plat-omap/include/mach/serial.h +4
-1+#define OMAP_UART2_BASE 0x4806c000 +#define OMAP_UART3_BASE 0x48020000 +#define OMAP_UART4_BASE 0x4806e000 +#define OMAP_MAX_NR_PORTS 4#endif -#define OMAP_MAX_NR_PORTS 3#define OMAP1510_BASE_BAUD (12000000/16)#define OMAP16XX_BASE_BAUD (48000000/16)#define OMAP24XX_BASE_BAUD (48000000/16)
Again, we should fix the serial defines so we don't have ifdef for the various processors. I think this is already in Kevin's uart patches, just FYI, OK to keep for now.
Quoted 6 lines
arch/arm/plat-omap/include/mach/system.h +0
-0@@ -48,4 +48,11 @@ static inline void arch_reset(char mode, const char *cmd)omap_prcm_arch_reset (mode);
arch/arm/plat-omap/include/mach/system.h static inline void arch_reset(char mode, const char *cmd) · line 58
Quoted 10 lines
arch/arm/plat-omap/include/mach/system.h +7
-0} +#ifdef CONFIG_ARCH_OMAP4 +void omap_prcm_arch_reset (char mode) +{ +/* dummy hook for Linking */ +} +#endif +#endif
This should be named omap4_prcm_arch_reset() and then we just set the right function pointer. Otherwise we'll break multi-omap unnecessarily!
Tony
RE: [PATCH 3/7][RFC] OMAP4: Update common omap platform headers.
Quoted 11 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Tony Lindgren
Sent: Tuesday, April 21, 2009 11:57 PM
To: Shilimkar, Santosh
Cc: [email protected]
Subject: Re: [PATCH 3/7][RFC] OMAP4: Update common omap platform headers.
Quoted 9 lines
arch/arm/plat-omap/include/mach/irqs.h line 325
Quoted 6 lines
arch/arm/plat-omap/include/mach/irqs.h +5
-1-#define INT_24XX_SPI3_IRQ 91 +#ifdef CONFIG_ARCH_OMAP4 +#define IRQ_GIC_START 32 +#else +#define IRQ_GIC_START 0 +#endif This ifdef we don't want to do as it blocks the compile for multi-omap.
Not sure why this should break multi-omap. As I mentioned in one of the patch OMAP4 may not be
able to support multi-omap because of major differences on Memory controller and Interrupt handling.
This macro ensures that only for OMAP4 all the IRQ lines are offseted by 32 and for rest of the OMAPs the offset is zero. Because that's the only change necessary.
May be I haven't understood your point here.
Quoted 8 lines
How about just add extra + 32 to the omap4 specific defines? Something like this maybe:
#define
OMAP4_GIC_OFFSET32
#defineINT_44XX_SP15_IRQ(69 +IRQ_GIC_START+OMAP4_GIC_OFFSET)It's OK to define the numbers separately for each processors:
I thought about this but this will have impact on the drivers as well. In every driver you need to put different IRQ line macros depending on the OMAP2/3/4.
Just as an example UART1 uses "INT_24XX_UART1_IRQ" as the IRQ line number for OMAP2, OMAP3 and now for OMAP4 ( just offseted by 32).
If we define separate macros for each processor, we would be unnecessarily polluting the driver code with switches. Secondly, in this file itself we will be adding around 100 + lines of code just to take care of 32 offset. If we are not breaking multi-omap for OMAP2/3, then this should be ok.
Quoted 10 lines
Review
Quoted 1 line
(quoted diff) +0
-0
b/arch/arm/plat-omap/include/mach/system.harch/arm/plat-omap/include/mach/system.h static inline void arch_reset(char mode,
Quoted 4 lines
index 1060e34..371f98a 100644
arch/arm/plat-omap/include/mach/system.h +0
-0@@ -48,4 +48,11 @@ static inline void arch_reset(char mode,const char *cmd)
Quoted 3 lines
arch/arm/plat-omap/include/mach/system.h +0
-0omap_prcm_arch_reset (mode); }
Quoted 12 lines
arch/arm/plat-omap/include/mach/system.h static inline void arch_reset(char mode, const char *cmd) · line 58
Quoted 8 lines
arch/arm/plat-omap/include/mach/system.h +7
-0+#ifdef CONFIG_ARCH_OMAP4 +void omap_prcm_arch_reset (char mode) +{ +/* dummy hook for Linking */ +} +#endif +#endif This should be named
omap4_prcm_arch_reset()and then we just set the right function pointer. Otherwise we'll break multi-omap unnecessarily!
omap_prcm_arch_reset() is called from arch_reset(). Currently since prcm files are not present/used for omap4, I get linking problem for just this API. Even if I make omap4_prcm_arch_reset(), I still need to compile out omap_prcm_arch_reset() from arch_reset() which will look worser than this one.
Thanks !!
Regards
Santosh
Tony Lindgren
maintainerRe: [PATCH 3/7][RFC] OMAP4: Update common omap platform headers.
Quoted 20 lines · Shilimkar, Santosh
Quoted 11 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Tony Lindgren
Sent: Tuesday, April 21, 2009 11:57 PM
To: Shilimkar, Santosh
Cc: [email protected]
Subject: Re: [PATCH 3/7][RFC] OMAP4: Update common omap platform headers.Quoted 9 lines
arch/arm/plat-omap/include/mach/irqs.h line 325
Quoted 6 lines
arch/arm/plat-omap/include/mach/irqs.h +5
-1-#define INT_24XX_SPI3_IRQ 91 +#ifdef CONFIG_ARCH_OMAP4 +#define IRQ_GIC_START 32 +#else +#define IRQ_GIC_START 0 +#endif This ifdef we don't want to do as it blocks the compile for multi-omap.
Quoted 5 lines
Not sure why this should break multi-omap. As I mentioned in one of the patch OMAP4 may not be
able to support multi-omap because of major differences on Memory controller and Interrupt handling.
This macro ensures that only for OMAP4 all the IRQ lines are offseted by 32 and for rest of the OMAPs the offset is zero. Because that's the only change necessary.May be I haven't understood your point here.
It makes the irq lines wrong if CONFIG_ARCH_OMAP4 and CONFIG_ARCH_OMAP3 are selected.
Quoted 10 lines
Quoted 8 lines
How about just add extra + 32 to the omap4 specific defines? Something like this maybe:
#define
OMAP4_GIC_OFFSET32
#defineINT_44XX_SP15_IRQ(69 +IRQ_GIC_START+OMAP4_GIC_OFFSET)It's OK to define the numbers separately for each processors:
I thought about this but this will have impact on the drivers as well. In every driver you need to put different IRQ line macros depending on the OMAP2/3/4.
No. The interrupt numbers are coming from platform_data. You always have separate platform_data for different processors.
Quoted 1 line
Just as an example UART1 uses "
INT_24XX_UART1_IRQ" as the IRQ line number for OMAP2, OMAP3 and now for OMAP4 ( just offseted by 32).
This needs to be fixed in the serial code. I believe that's already in Kevin's patches.
Quoted 1 line
If we define separate macros for each processor, we would be unnecessarily polluting the driver code with switches. Secondly, in this file itself we will be adding around 100 + lines of code just to take care of 32 offset.
The numbers are not the same. It's OK to add separate defines for data that is not the same. The unused defines just will not be used anywhere.
Quoted 1 line
If we are not breaking multi-omap for OMAP2/3, then this should be ok.
Nope, see above.
Tony
Quoted 30 lines
Quoted 11 lines
Review
Quoted 2 lines
(quoted diff) +0
-0
b/arch/arm/plat-omap/include/mach/system.harch/arm/plat-omap/include/mach/system.h static inline void arch_reset(char mode,
Quoted 4 lines
index 1060e34..371f98a 100644
arch/arm/plat-omap/include/mach/system.h +0
-0@@ -48,4 +48,11 @@ static inline void arch_reset(char mode,const char *cmd)
Quoted 3 lines
arch/arm/plat-omap/include/mach/system.h +0
-0omap_prcm_arch_reset (mode); }Quoted 12 lines
arch/arm/plat-omap/include/mach/system.h static inline void arch_reset(char mode, const char *cmd) · line 58
Quoted 8 lines
arch/arm/plat-omap/include/mach/system.h +7
-0+#ifdef CONFIG_ARCH_OMAP4 +void omap_prcm_arch_reset (char mode) +{ +/* dummy hook for Linking */ +} +#endif +#endif This should be named
omap4_prcm_arch_reset()and then we just set the right function pointer. Otherwise we'll break multi-omap unnecessarily!
omap_prcm_arch_reset()is called fromarch_reset(). Currently since prcm files are not present/used for omap4, I get linking problem for just this API. Even if I makeomap4_prcm_arch_reset(), I still need to compile outomap_prcm_arch_reset()fromarch_reset()which will look worser than this one.Thanks !!
Regards
Santosh
RE: [PATCH 3/7][RFC] OMAP4: Update common omap platform headers.
Quoted 8 lines
Quoted 4 lines
Quoted 3 lines
This ifdef we don't want to do as it blocks the compile for multi-omap.
Not sure why this should break multi-omap. As I mentioned
in one of the patch OMAP4 may not be
Quoted 1 line
able to support multi-omap because of major differences on
Memory controller and Interrupt handling.
Quoted 1 line
This macro ensures that only for OMAP4 all the IRQ lines
Quoted 8 lines
are offseted by 32 and for rest of the OMAPs the offset is zero. Because that's the only change necessary.
Quoted 2 lines
May be I haven't understood your point here.
It makes the irq lines wrong if
CONFIG_ARCH_OMAP4andCONFIG_ARCH_OMAP3
are selected.
Agree. My assumption was OMAP3 and OMAP4 both won't get selected together. If they are then it's straight makes IRQ lines wrong.
Quoted 23 lines
Quoted 10 lines
Quoted 8 lines
How about just add extra + 32 to the omap4 specific defines? Something like this maybe:
#define
OMAP4_GIC_OFFSET32
#defineINT_44XX_SP15_IRQ(69 +IRQ_GIC_START+OMAP4_GIC_OFFSET)It's OK to define the numbers separately for each processors:
I thought about this but this will have impact on the
drivers as well. In every driver you need to put different IRQ line macros depending on the OMAP2/3/4.
No. The interrupt numbers are coming from
platform_data. You always have separateplatform_datafor different processors.Quoted 1 line
Just as an example UART1 uses "
INT_24XX_UART1_IRQ" as theIRQ line number for OMAP2, OMAP3 and now for OMAP4 ( just offseted by 32).
This needs to be fixed in the serial code. I believe that's already in Kevin's patches.
Quoted 8 lines
Quoted 1 line
If we define separate macros for each processor, we would
be unnecessarily polluting the driver code with switches. Secondly, in this file itself we will be adding around 100 + lines of code just to take care of 32 offset.
The numbers are not the same. It's OK to add separate defines for data that is not the same. The unused defines just will not be used anywhere.
If we agree to cleanup the driver platform structures wherever needed, then no issues with separate lines. In that case no #ifdef necessary. Bye the way #define INT_44XX_SP15_IRQ (69 + OMAP4_GIC_OFFSET) is sufficient. Any particul;ar reason you want it this way.
#define INT_44XX_SP15_IRQ (69 + IRQ_GIC_START + OMAP4_GIC_OFFSET) ?
Tony Lindgren
maintainerRe: [PATCH 3/7][RFC] OMAP4: Update common omap platform headers.
Quoted 46 lines · Shilimkar, Santosh
Quoted 8 lines
Quoted 4 lines
Quoted 3 lines
This ifdef we don't want to do as it blocks the compile for multi-omap.
Not sure why this should break multi-omap. As I mentioned
in one of the patch OMAP4 may not be
Quoted 1 line
able to support multi-omap because of major differences on
Memory controller and Interrupt handling.
Quoted 1 line
This macro ensures that only for OMAP4 all the IRQ lines
Quoted 8 lines
are offseted by 32 and for rest of the OMAPs the offset is zero. Because that's the only change necessary.
Quoted 2 lines
May be I haven't understood your point here.
It makes the irq lines wrong if
CONFIG_ARCH_OMAP4andCONFIG_ARCH_OMAP3
are selected.Agree. My assumption was OMAP3 and OMAP4 both won't get selected together. If they are then it's straight makes IRQ lines wrong.
Quoted 28 lines
Quoted 10 lines
Quoted 8 lines
How about just add extra + 32 to the omap4 specific defines? Something like this maybe:
#define
OMAP4_GIC_OFFSET32
#defineINT_44XX_SP15_IRQ(69 +IRQ_GIC_START+OMAP4_GIC_OFFSET)It's OK to define the numbers separately for each processors:
I thought about this but this will have impact on the
drivers as well. In every driver you need to put different IRQ line macros depending on the OMAP2/3/4.
No. The interrupt numbers are coming from
platform_data. You always have separateplatform_datafor different processors.Quoted 1 line
Just as an example UART1 uses "
INT_24XX_UART1_IRQ" as theIRQ line number for OMAP2, OMAP3 and now for OMAP4 ( just offseted by 32).
This needs to be fixed in the serial code. I believe that's already in Kevin's patches.
Quoted 1 line
If we define separate macros for each processor, we would
be unnecessarily polluting the driver code with switches. Secondly, in this file itself we will be adding around 100 + lines of code just to take care of 32 offset.
Quoted 6 lines
Quoted 3 lines
The numbers are not the same. It's OK to add separate defines for data that is not the same. The unused defines just will not be used anywhere.
If we agree to cleanup the driver platform structures wherever needed, then no issues with separate lines. In that case no #ifdef necessary. Bye the way #define
INT_44XX_SP15_IRQ(69 +OMAP4_GIC_OFFSET) is sufficient. Any particul;ar reason you want it this way.
#defineINT_44XX_SP15_IRQ(69 +IRQ_GIC_START+OMAP4_GIC_OFFSET) ?
No reason, unless there's some logic to the numbering where the offset makes things easier to read :)
Tony
Tony Lindgren
maintainerRe: [PATCH 2/7][RFC] OMAP4: Create board support for OMAP_4430SDP.
In reply to Santosh ShilimkarQuoted 138 lines · Santosh Shilimkar
This patch creates the bare minimal board files to support
OMAP_4430SDP. Additinaly newomap44xx.his created which contains the base addresses for OMAP4430.Fileomap34xx.his adapted to avoid multiple definitions of common omap base address definitions.Signed-off-by Santosh Shilimkar <[email protected]>--- arch/arm/mach-omap2/board-4430sdp.c | 91 +++++++++++++++++++++++ arch/arm/plat-omap/include/mach/board-4430sdp.h | 28 +++++++ arch/arm/plat-omap/include/mach/hardware.h | 1 + arch/arm/plat-omap/include/mach/omap34xx.h | 8 +- arch/arm/plat-omap/include/mach/omap44xx.h | 61 +++++++++++++++ 5 files changed, 185 insertions(+), 4 deletions(-) create mode 100644 arch/arm/mach-omap2/board-4430sdp.c create mode 100644 arch/arm/plat-omap/include/mach/board-4430sdp.h create mode 100644 arch/arm/plat-omap/include/mach/omap44xx.harch/arm/mach-omap2/board-4430sdp.c new file +91
-0@@ -0,0 +1,91 @@ +/* +* Board support file for OMAP4430 SDP. +* +* Copyright (C) 2009 Texas Instruments +* +* Author: Santosh Shilimkar <[email protected]> +* +* Based on mach-omap2/board-3430sdp.c +* +* 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. +*/ + +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/platform_device.h> +#include <linux/io.h> + +#include <mach/hardware.h> +#include <asm/mach-types.h> +#include <asm/mach/arch.h> +#include <asm/mach/map.h> + +#include <mach/gpio.h> +#include <mach/board.h> +#include <mach/common.h> +#include <mach/control.h> +#include <asm/hardware/gic.h> + +static struct platform_device sdp4430_lcd_device = { + .name ="sdp4430_lcd" , + .id =-1 , +}; + +static struct platform_device *sdp4430_devices[]__initdata = { + &sdp4430_lcd_device, +}; + +static struct omap_uart_config sdp4430_uart_config__initdata = { + .enabled_uarts = ((1 <<0 ) | (1 <<1 ) | (1 <<2 )), +}; + +static struct omap_lcd_config sdp4430_lcd_config__initdata = { + .ctrl_name ="internal" , +}; + +static struct omap_board_config_kernel sdp4430_config[]__initdata = { + {OMAP_TAG_UART , &sdp4430_uart_config }, + {OMAP_TAG_LCD , &sdp4430_lcd_config }, +}; + +static void __init gic_init_irq (void ) +{ +gic_dist_init (0 ,IO_ADDRESS (OMAP44XX_GIC_DIST_BASE ),29 ); +gic_cpu_init (0 ,IO_ADDRESS (OMAP44XX_GIC_CPU_BASE )); +} + +static void __init omap_4430sdp_init_irq (void ) +{ +omap2_init_common_hw (NULL ); +gic_init_irq (); +omap_gpio_init (); +} + + +static void __init omap_4430sdp_init (void ) +{ +platform_add_devices (sdp4430_devices,ARRAY_SIZE (sdp4430_devices)); + omap_board_config = sdp4430_config; + omap_board_config_size =ARRAY_SIZE (sdp4430_config); +omap_serial_init (); + +} + +static void __init omap_4430sdp_map_io (void ) +{ +omap2_set_globals_443x (); +omap2_map_common_io (); +} + +MACHINE_START (OMAP_4430SDP ,"OMAP4430 4430SDP board" ) +/* Maintainer: Santosh Shilimkar - Texas Instruments Inc */ + .phys_io = 0x48000000, + .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, + .boot_params = 0x80000100, + .map_io = omap_4430sdp_map_io, + .init_irq = omap_4430sdp_init_irq, + .init_machine = omap_4430sdp_init, + .timer = &omap_timer, +MACHINE_END arch/arm/plat-omap/include/mach/board-4430sdp.h new file +18
-0@@ -0,0 +1,28 @@ +/* +* Board support header for OMAP4430 SDP. +* +* Copyright (C) 2009 Texas Instruments +* +* Author: Santosh Shilimkar <[email protected]> +* +* Based on arch/arm/plat-omap/include/mach/board-3430sdp.h +* +* 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 __ARCH_ARM_MACH_OMAP4_BOARD_4430SDP_H +#define __ARCH_ARM_MACH_OMAP4_BOARD_4430SDP_H + +extern void sdp4430_flash_init (void ); +
arch/arm/plat-omap/include/mach/board-4430sdp.h line 28
Quoted 10 lines
arch/arm/plat-omap/include/mach/board-4430sdp.h new file +10
-0+/* NAND */ +#define DEBUG_BASE 0x08000000/* debug board */ +#define NAND_BASE 0x0C000000/* NAND flash */ +#define ONENAND_MAP 0x20000000/* OneNand flash */ + +/* various memory sizes */ +#define FLASH_SIZE_SDPV1 SZ_64M +#define FLASH_SIZE_SDPV2 SZ_128M +#endif +
Let's leave out the board-4430sdp.h and move the defines to the board-4430sdp.c.
Also it sounds like the NAND defines are not yet needed. I'm thinking that we should have just a generic gpmc-onenand.c file based on the board-n800-flash.c that works for all boards with onenand connected to the GPMC.
Quoted 30 lines
arch/arm/plat-omap/include/mach/hardware.h +1
-0@@ -285,5 +285,6 @@#include "omap16xx.h" #include "omap24xx.h" #include "omap34xx.h" +#include "omap44xx.h" #endif /* __ASM_ARCH_OMAP_HARDWARE_H */ arch/arm/plat-omap/include/mach/omap34xx.h +0
-4@@ -31,13 +31,9 @@#define L4_34XX_BASE 0x48000000#define L4_WK_34XX_BASE 0x48300000 -#define L4_WK_OMAP_BASE L4_WK_34XX_BASE#define L4_PER_34XX_BASE 0x49000000 -#define L4_PER_OMAP_BASE L4_PER_34XX_BASE#define L4_EMU_34XX_BASE 0x54000000 -#define L4_EMU_BASE L4_EMU_34XX_BASE#define L3_34XX_BASE 0x68000000 -#define L3_OMAP_BASE L3_34XX_BASE#define OMAP3430_32KSYNCT_BASE 0x48320000#define OMAP3430_CM_BASE 0x48004800
arch/arm/plat-omap/include/mach/omap34xx.h line 90
Quoted 10 lines
arch/arm/plat-omap/include/mach/omap34xx.h +4
-0@@ -85,6 +81,10 @@#if defined(CONFIG_ARCH_OMAP3430 ) +#define L4_WK_OMAP_BASE L4_WK_34XX_BASE +#define L4_PER_OMAP_BASE L4_PER_34XX_BASE +#define L4_EMU_BASE L4_EMU_34XX_BASE +#define L3_OMAP_BASE L3_34XX_BASE#define OMAP2_32KSYNCT_BASE OMAP3430_32KSYNCT_BASE#define OMAP2_CM_BASE OMAP3430_CM_BASE#define OMAP2_PRM_BASE OMAP3430_PRM_BASE
These defines should be set up in a way where they don't block compile for multi-omap. OK to keep for now, I'll post some clean-up patches for all processors under mach-omap2.
Quoted 39 lines
arch/arm/plat-omap/include/mach/omap44xx.h new file +33
-0@@ -0,0 +1,61 @@ +/* +* Address mappings and base address for OMAP4 interconnects +* and peripherals. +* +* Copyright (C) 2009 Texas Instruments +* +* Author: Santosh Shilimkar <[email protected]> +* +* 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_ARCH_OMAP44XX_H +#define __ASM_ARCH_OMAP44XX_H + +/* +* Please place only base defines here and put the rest in device +* specific headers. +*/ +#define L4_44XX_BASE 0x4A000000 +#define L4_WK_44XX_BASE 0x4A300000 +#define L4_PER_44XX_BASE 0x48000000 +#define L4_EMU_44XX_BASE 0x54000000 +#define L3_44XX_BASE 0x44000000 +#define OMAP4430_32KSYNCT_BASE 0x4A304000 +#define OMAP4430_CM_BASE 0x4A004000 +#define OMAP4430_PRM_BASE 0x48306000 +#define OMAP44XX_GPMC_BASE 0x50000000 +#define OMAP443X_SCM_BASE 0x4A002000 +#define OMAP443X_CTRL_BASE OMAP443X_SCM_BASE +#define OMAP44XX_IC_BASE 0x48200000 +#define OMAP44XX_IVA_INTC_BASE 0x40000000 +#define IRQ_SIR_IRQ 0x0040
arch/arm/plat-omap/include/mach/omap44xx.h line 43
Quoted 10 lines
arch/arm/plat-omap/include/mach/omap44xx.h new file +10
-0+#define OMAP44XX_GIC_DIST_BASE 0x48241000 +#define OMAP44XX_GIC_CPU_BASE 0x48240100 +#define OMAP44XX_VA_GIC_CPU_BASE IO_ADDRESS(OMAP44XX_GIC_CPU_BASE) +#define OMAP44XX_SCU_BASE 0x48240000 +#define OMAP44XX_VA_SCU_BASE IO_ADDRESS(OMAP44XX_SCU_BASE) +#define OMAP44XX_LOCAL_TWD_BASE 0x48240600 +#define OMAP44XX_VA_LOCAL_TWD_BASE IO_ADDRESS(OMAP44XX_LOCAL_TWD_BASE) +#define OMAP44XX_LOCAL_TWD_SIZE 0x00000100 +#define OMAP44XX_WKUPGEN_BASE 0x48281000 +#define OMAP44XX_VA_WKUPGEN_BASE IO_ADDRESS(OMAP44XX_WKUPGEN_BASE)
Could these defines have just OMAP4_ prefix? If some later omap4 changes these, we can define them separately with the correct prefix.
Quoted 7 lines
arch/arm/plat-omap/include/mach/omap44xx.h new file +7
-0+ +/* Common macros between OMAPs */ + +#if defined(CONFIG_ARCH_OMAP44XX ) + +#define L4_WK_OMAP_BASE L4_WK_44XX_BASE +#define L4_PER_OMAP_BASE L4_PER_44XX_BASE
arch/arm/plat-omap/include/mach/omap44xx.h line 60
Quoted 10 lines
arch/arm/plat-omap/include/mach/omap44xx.h new file +10
-0+#define L4_EMU_BASE L4_EMU_44XX_BASE +#define L3_OMAP_BASE L3_44XX_BASE +#define OMAP2_32KSYNCT_BASE OMAP4430_32KSYNCT_BASE +#define OMAP2_CM_BASE OMAP4430_CM_BASE +#define OMAP2_PRM_BASE OMAP4430_PRM_BASE +#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP44XX_IC_BASE) + +#endif + +#endif /* __ASM_ARCH_OMAP44XX_H */
These defines will be cleaned up too for all processors during this cycle as they block compile for multi-omap. Just FYI, some minor rebasing will be needed at some point later on.
Regards,
Tony
RE: [PATCH 2/7][RFC] OMAP4: Create board support for OMAP_4430SDP.
Quoted 35 lines
Quoted 11 lines
+ * Board support header for OMAP4430 SDP.
+ *
+ * Copyright (C) 2009 Texas Instruments
+ *
+ * Author: Santosh Shilimkar <[email protected]>
+ *
+ * Based onarch/arm/plat-omap/include/mach/board-3430sdp.h
+ *
+ * This program is free software; you can redistribute itand/or modify
Quoted 1 line
+ * it under the terms of the GNU General Public License
version 2 as
Quoted 7 lines
+ * published by the Free Software Foundation.
+ */arch/arm/plat-omap/include/mach/board-4430sdp.h new file +5
-0+#ifndef __ARCH_ARM_MACH_OMAP4_BOARD_4430SDP_H +#define __ARCH_ARM_MACH_OMAP4_BOARD_4430SDP_H + +extern void sdp4430_flash_init (void ); +arch/arm/plat-omap/include/mach/board-4430sdp.h line 28
Quoted 10 lines
arch/arm/plat-omap/include/mach/board-4430sdp.h new file +10
-0+/* NAND */ +#define DEBUG_BASE 0x08000000/* debug board */ +#define NAND_BASE 0x0C000000/* NAND flash */ +#define ONENAND_MAP 0x20000000/* OneNand flash */ + +/* various memory sizes */ +#define FLASH_SIZE_SDPV1 SZ_64M +#define FLASH_SIZE_SDPV2 SZ_128M +#endif +Let's leave out the
board-4430sdp.hand move the defines to theboard-4430sdp.c.
Quoted 4 lines
Also it sounds like the NAND defines are not yet needed. I'm thinking that we should have just a generic
gpmc-onenand.cfile based on theboard-n800-flash.cthat works for all boards with onenand connected to the GPMC.
Yes. This was added as a place holder since next NAND driver patches would need that. Sounds ok to me but may be Nand driver owner might have some comments on the same. We can take this up later when adding NAND support. For now I agree with you point.
Quoted 6 lines
b/arch/arm/plat-omap/include/mach/omap44xx.h
IO_ADDRESS(OMAP44XX_SCU_BASE)Review
Quoted 2 lines
(quoted diff) +2
-0+#define OMAP44XX_LOCAL_TWD_BASE 0x48240600 +#define OMAP44XX_VA_LOCAL_TWD_BASE
IO_ADDRESS(OMAP44XX_LOCAL_TWD_BASE)
Quoted 8 lines
arch/arm/plat-omap/include/mach/omap44xx.h
Quoted 3 lines
arch/arm/plat-omap/include/mach/omap44xx.h new file +3
-0+#define OMAP44XX_LOCAL_TWD_SIZE 0x00000100 +#define OMAP44XX_WKUPGEN_BASE 0x48281000 +#define OMAP44XX_VA_WKUPGEN_BASE
IO_ADDRESS(OMAP44XX_WKUPGEN_BASE)Could these defines have just
OMAP4_prefix? If some later omap4 changes these, we can define them separately with the correct prefix.
I have kept this just to keep uniformity. Also generally we will have derivatives of ICs and this defines would Help there. Instead of modifying later we can keep this way.
Regards
Santosh
Quoted 15 lines · Santosh Shilimkar
This patch creates the architectural macros for OMAP4. The
MULTI_OMAPbuild is not yet supported by OMAP4.Signed-off-by Santosh Shilimkar <[email protected]>--- arch/arm/mach-omap2/Kconfig | 16 +++++++++++++++- arch/arm/plat-omap/Kconfig | 10 +++++++--- arch/arm/plat-omap/include/mach/cpu.h | 17 +++++++++++++++-- 3 files changed, 37 insertions(+), 6 deletions(-)arch/arm/mach-omap2/Kconfig +0
-0
arch/arm/mach-omap2/Kconfig config ARCH_OMAP3430 · line 30
Quoted 7 lines
arch/arm/mach-omap2/Kconfig +4
-0@@ -24,8 +24,18 @@ config ARCH_OMAP3430 depends on ARCH_OMAP3 && ARCH_OMAP34XX select ARCH_OMAP_OTG +config ARCH_OMAP44XX + bool "OMAP44xx Based System" + depends on ARCH_OMAP4 +
I see this config option used only once in io.c, and that one should likely just use CONFIG_ARCH_OMAP4.
I'm worried about creating too many Kconfig options for CPU types which we don't really need. All the CPU-type and revision detection is done at runtime so IMHO, we shouldn't have Kconfig options for chip revisions.
Also helps to avoid confusion if OMAP45xx and OMAP46xx chips come out as the case with OMAP3.
I know OMAP3 has ARCH_OMAP3 and ARCH_OMAP34XX and ARCH_OMAP3430, but for OMAP4, I think we should get rid of all of these except CONFIG_ARCH_OMAP4.
arch/arm/mach-omap2/Kconfig config ARCH_OMAP3430 · line 36
Quoted 6 lines
arch/arm/mach-omap2/Kconfig +6
-0+config ARCH_OMAP4430 + bool "OMAP4430 support" + depends on ARCH_OMAP4 && ARCH_OMAP44XX + select ARM_GIC + +
And this one isn't used at all, so further emphasizes my point.
Then all the ARCH_OMAP4* below could be simply replaced by ARCH_OMAP4
Kevin
Quoted 107 lines
arch/arm/mach-omap2/Kconfig +5
-1comment "OMAP Board Type" - depends on ARCH_OMAP2 || ARCH_OMAP3 + depends on ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4 config MACH_OMAP_GENERIC bool "Generic OMAP board"@@ -67,3 +77,7 @@ config MACH_OMAP_3430SDP config MACH_NOKIA_RX51 bool "Nokia RX-51 board" depends on ARCH_OMAP3 && ARCH_OMAP34XX + +config MACH_OMAP_4430SDP + bool "OMAP 4430 SDP board" + depends on ARCH_OMAP4 && ARCH_OMAP44XXarch/arm/plat-omap/Kconfig +7
-3@@ -23,6 +23,10 @@ config ARCH_OMAP3 select CPU_V7 select COMMON_CLKDEV +config ARCH_OMAP4 + bool "TI OMAP4" + select CPU_V7 + endchoice comment "OMAP Feature Selections"@@ -128,13 +132,13 @@ config OMAP_MPU_TIMER config OMAP_32K_TIMER bool "Use 32KHz timer" - depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX + depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP44XX help Select this option if you want to enable the OMAP 32KHz timer. This timer saves power compared to the OMAP_MPU_TIMER, and has support for no tick during idle. The 32KHz timer provides less intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is - currently only available for OMAP16XX, 24XX and 34XX. + currently only available for OMAP16XX, 24XX, 34XX and 44XX. endchoice@@ -149,7 +153,7 @@ config OMAP_32K_TIMER_HZ config OMAP_DM_TIMER bool "Use dual-mode timer" - depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX + depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP44XX help Select this option if you want to use OMAP Dual-Mode timers.arch/arm/plat-omap/include/mach/cpu.h +15
-2@@ -155,6 +155,8 @@ IS_OMAP_SUBCLASS(343x, 0x343)#define cpu_is_omap243x () 0#define cpu_is_omap34xx () 0#define cpu_is_omap343x () 0 +#define cpu_is_omap44xx () 0 +#define cpu_is_omap443x () 0#if defined(MULTI_OMAP1 )# if defined(CONFIG_ARCH_OMAP730 )@@ -348,12 +350,21 @@ IS_OMAP_TYPE(3430, 0x3430)# define cpu_is_omap3430 () is_omap3430()#endif +# if defined(CONFIG_ARCH_OMAP44XX ) +# undef cpu_is_omap44xx +# undef cpu_is_omap443x +# define cpu_is_omap44xx () 1 +# define cpu_is_omap443x () 1 +# endif +/* Macros to detect if we have OMAP1 or OMAP2 */ #define cpu_class_is_omap1 () (cpu_is_omap7xx() || cpu_is_omap15xx() || \ cpu_is_omap16xx()) -#define cpu_class_is_omap2 () (cpu_is_omap24xx() || cpu_is_omap34xx()) +#define cpu_class_is_omap2 () (cpu_is_omap24xx() || cpu_is_omap34xx() || \ + cpu_is_omap44xx()) -#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) +#if defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 ) || \ + defined(CONFIG_ARCH_OMAP4 )/* Various silicon revisions for omap2 */ #define OMAP242X_CLASS 0x24200024@@ -370,6 +381,8 @@ IS_OMAP_TYPE(3430, 0x3430)#define OMAP3430_REV_ES3_0 0x34303034#define OMAP3430_REV_ES3_1 0x34304034 +#define OMAP443X_CLASS 0x44300034 +/* * omap_chip bits * Signature · 6 lines
1.5.4.7 -- 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