X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-omap%2Fhardware.h;h=481048d65214815d85b22568b742995f3ea3269d;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=348072bc4fbcf396c8ee00a96801f295d21d26af;hpb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;p=linux-2.6.git diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h index 348072bc4..481048d65 100644 --- a/include/asm-arm/arch-omap/hardware.h +++ b/include/asm-arm/arch-omap/hardware.h @@ -37,11 +37,12 @@ #define __ASM_ARCH_OMAP_HARDWARE_H #include -#include #ifndef __ASSEMBLER__ #include +#include #endif #include +#include /* * --------------------------------------------------------------------------- @@ -51,6 +52,19 @@ * --------------------------------------------------------------------------- */ +/* + * ---------------------------------------------------------------------------- + * Timers + * ---------------------------------------------------------------------------- + */ +#define OMAP_MPU_TIMER1_BASE (0xfffec500) +#define OMAP_MPU_TIMER2_BASE (0xfffec600) +#define OMAP_MPU_TIMER3_BASE (0xfffec700) +#define MPU_TIMER_FREE (1 << 6) +#define MPU_TIMER_CLOCK_ENABLE (1 << 5) +#define MPU_TIMER_AR (1 << 1) +#define MPU_TIMER_ST (1 << 0) + /* * ---------------------------------------------------------------------------- * Clocks @@ -64,6 +78,7 @@ #define ARM_RSTCT1 (CLKGEN_REG_BASE + 0x10) #define ARM_RSTCT2 (CLKGEN_REG_BASE + 0x14) #define ARM_SYSST (CLKGEN_REG_BASE + 0x18) +#define ARM_IDLECT3 (CLKGEN_REG_BASE + 0x24) #define CK_RATEF 1 #define CK_IDLEF 2 @@ -74,10 +89,12 @@ /* DPLL control registers */ #define DPLL_CTL (0xfffecf00) -/* DSP clock control */ +/* DSP clock control. Must use __raw_readw() and __raw_writew() with these */ #define DSP_CONFIG_REG_BASE (0xe1008000) +#define DSP_CKCTL (DSP_CONFIG_REG_BASE + 0x0) #define DSP_IDLECT1 (DSP_CONFIG_REG_BASE + 0x4) #define DSP_IDLECT2 (DSP_CONFIG_REG_BASE + 0x8) +#define DSP_RSTCT2 (DSP_CONFIG_REG_BASE + 0x14) /* * --------------------------------------------------------------------------- @@ -86,72 +103,53 @@ */ #define ULPD_REG_BASE (0xfffe0800) #define ULPD_IT_STATUS (ULPD_REG_BASE + 0x14) +#define ULPD_SETUP_ANALOG_CELL_3 (ULPD_REG_BASE + 0x24) #define ULPD_CLOCK_CTRL (ULPD_REG_BASE + 0x30) +# define DIS_USB_PVCI_CLK (1 << 5) /* no USB/FAC synch */ +# define USB_MCLK_EN (1 << 4) /* enable W4_USB_CLKO */ #define ULPD_SOFT_REQ (ULPD_REG_BASE + 0x34) +# define SOFT_UDC_REQ (1 << 4) +# define SOFT_USB_CLK_REQ (1 << 3) +# define SOFT_DPLL_REQ (1 << 0) #define ULPD_DPLL_CTRL (ULPD_REG_BASE + 0x3c) #define ULPD_STATUS_REQ (ULPD_REG_BASE + 0x40) #define ULPD_APLL_CTRL (ULPD_REG_BASE + 0x4c) #define ULPD_POWER_CTRL (ULPD_REG_BASE + 0x50) +#define ULPD_SOFT_DISABLE_REQ_REG (ULPD_REG_BASE + 0x68) +# define DIS_MMC2_DPLL_REQ (1 << 11) +# define DIS_MMC1_DPLL_REQ (1 << 10) +# define DIS_UART3_DPLL_REQ (1 << 9) +# define DIS_UART2_DPLL_REQ (1 << 8) +# define DIS_UART1_DPLL_REQ (1 << 7) +# define DIS_USB_HOST_DPLL_REQ (1 << 6) +#define ULPD_SDW_CLK_DIV_CTRL_SEL (ULPD_REG_BASE + 0x74) #define ULPD_CAM_CLK_CTRL (ULPD_REG_BASE + 0x7c) /* * --------------------------------------------------------------------------- - * Timers + * Watchdog timer * --------------------------------------------------------------------------- */ -#define OMAP_32kHz_TIMER_BASE 0xfffb9000 - -/* 32k Timer Registers */ -#define TIMER32k_CR 0x08 -#define TIMER32k_TVR 0x00 -#define TIMER32k_TCR 0x04 - -/* 32k Timer Control Register definition */ -#define TIMER32k_TSS (1<<0) -#define TIMER32k_TRB (1<<1) -#define TIMER32k_INT (1<<2) -#define TIMER32k_ARL (1<<3) - -/* MPU Timer base addresses */ -#define OMAP_TIMER1_BASE (0xfffec500) -#define OMAP_TIMER2_BASE (0xfffec600) -#define OMAP_TIMER3_BASE (0xfffec700) -#define OMAP_MPUTIMER_BASE OMAP_TIMER1_BASE -#define OMAP_MPUTIMER_OFFSET 0x100 - -/* MPU Timer Registers */ -#define OMAP_TIMER1_CNTL (OMAP_TIMER_BASE1 + 0x0) -#define OMAP_TIMER1_LOAD_TIM (OMAP_TIMER_BASE1 + 0x4) -#define OMAP_TIMER1_READ_TIM (OMAP_TIMER_BASE1 + 0x8) - -#define OMAP_TIMER2_CNTL (OMAP_TIMER_BASE2 + 0x0) -#define OMAP_TIMER2_LOAD_TIM (OMAP_TIMER_BASE2 + 0x4) -#define OMAP_TIMER2_READ_TIM (OMAP_TIMER_BASE2 + 0x8) - -#define OMAP_TIMER3_CNTL (OMAP_TIMER_BASE3 + 0x0) -#define OMAP_TIMER3_LOAD_TIM (OMAP_TIMER_BASE3 + 0x4) -#define OMAP_TIMER3_READ_TIM (OMAP_TIMER_BASE3 + 0x8) - -/* CNTL_TIMER register bits */ -#define MPUTIM_FREE (1<<6) -#define MPUTIM_CLOCK_ENABLE (1<<5) -#define MPUTIM_PTV_MASK (0x7<> ID_SHIFT) & ID_MASK) == OMAP_ID_730) -#else -#define cpu_is_omap730() 0 -#endif - -#ifdef CONFIG_ARCH_OMAP1510 #include "omap1510.h" -#define cpu_is_omap1510() (((OMAP_ID_REG >> ID_SHIFT) & ID_MASK) == OMAP_ID_1510) -#else -#define cpu_is_omap1510() 0 -#endif +#include "omap24xx.h" +#include "omap16xx.h" -#ifdef CONFIG_ARCH_OMAP1610 -#include "omap1610.h" -#define cpu_is_omap1710() (((OMAP_ID_REG >> ID_SHIFT) & ID_MASK) == OMAP_ID_1710) -/* Detect 1710 as 1610 for now */ -#define cpu_is_omap1610() (((OMAP_ID_REG >> ID_SHIFT) & ID_MASK) == OMAP_ID_1610 \ - || cpu_is_omap1710()) -#else -#define cpu_is_omap1610() 0 -#define cpu_is_omap1710() 0 -#endif - -#ifdef CONFIG_ARCH_OMAP5912 -#include "omap5912.h" -#define cpu_is_omap5912() (((OMAP_ID_REG >> ID_SHIFT) & ID_MASK) == OMAP_ID_5912) -#else -#define cpu_is_omap5912() 0 -#endif +#ifndef __ASSEMBLER__ /* * --------------------------------------------------------------------------- - * Board differentiation + * Board specific defines * --------------------------------------------------------------------------- */ @@ -341,20 +297,30 @@ #include "board-perseus2.h" #endif +#ifdef CONFIG_MACH_OMAP_FSAMPLE +#include "board-fsample.h" +#endif + #ifdef CONFIG_MACH_OMAP_H3 #include "board-h3.h" -#error "Support for H3 board not yet implemented." #endif #ifdef CONFIG_MACH_OMAP_H4 #include "board-h4.h" -#error "Support for H4 board not yet implemented." +#endif + +#ifdef CONFIG_MACH_OMAP_APOLLON +#include "board-apollon.h" #endif #ifdef CONFIG_MACH_OMAP_OSK #include "board-osk.h" #endif +#ifdef CONFIG_MACH_VOICEBLUE +#include "board-voiceblue.h" +#endif + #endif /* !__ASSEMBLER__ */ #endif /* __ASM_ARCH_OMAP_HARDWARE_H */