diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 16:05:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 16:05:57 -0400 |
| commit | 932c37c375cca25175f9b6acee4c75d7a96d985f (patch) | |
| tree | d7ba3620cd9a7a21c2de1bdfc7badd7637ed635e /include/asm-arm/arch-omap/hardware.h | |
| parent | c855ff3718e5f667b463b20b9de516b4cd7625ad (diff) | |
| parent | 805f53f085346b6765eda02820721a14ce0d644f (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits)
ARM: OMAP: Fix GCC-reported compile time bug
ARM: OMAP: restore CONFIG_GENERIC_TIME
ARM: OMAP: partial LED fixes
ARM: OMAP: add SoSSI clock (call propagate_rate for childrens)
ARM: OMAP: FB sync with N800 tree (support for dynamic SRAM allocations)
ARM: OMAP: Sync framebuffer headers with N800 tree
ARM: OMAP: Mostly cosmetic to sync up with linux-omap tree
ARM: OMAP: Fix gpmc header
ARM: OMAP: Add mailbox support for IVA
[ARM] armv7: add Makefile and Kconfig entries
[ARM] armv7: add support for asid-tagged VIVT I-cache
[ARM] armv7: add dedicated ARMv7 barrier instructions
[ARM] armv7: Add ARMv7 cacheid macros
[ARM] armv7: add support for ARMv7 cores.
[ARM] Fix ARM branch relocation range
[ARM] 4363/1: AT91: Remove legacy PIO definitions
[ARM] 4361/1: AT91: Build error
ARM: OMAP: Sync core code with linux-omap
ARM: OMAP: Sync headers with linux-omap
ARM: OMAP: h4 must have blinky leds!!
...
Diffstat (limited to 'include/asm-arm/arch-omap/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-omap/hardware.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h index 481048d6521..e225f4f39b3 100644 --- a/include/asm-arm/arch-omap/hardware.h +++ b/include/asm-arm/arch-omap/hardware.h | |||
| @@ -267,6 +267,15 @@ | |||
| 267 | #define OMAP_LPG2_PMR (OMAP_LPG2_BASE + 0x04) | 267 | #define OMAP_LPG2_PMR (OMAP_LPG2_BASE + 0x04) |
| 268 | 268 | ||
| 269 | /* | 269 | /* |
| 270 | * ---------------------------------------------------------------------------- | ||
| 271 | * Pulse-Width Light | ||
| 272 | * ---------------------------------------------------------------------------- | ||
| 273 | */ | ||
| 274 | #define OMAP_PWL_BASE 0xfffb5800 | ||
| 275 | #define OMAP_PWL_ENABLE (OMAP_PWL_BASE + 0x00) | ||
| 276 | #define OMAP_PWL_CLK_ENABLE (OMAP_PWL_BASE + 0x04) | ||
| 277 | |||
| 278 | /* | ||
| 270 | * --------------------------------------------------------------------------- | 279 | * --------------------------------------------------------------------------- |
| 271 | * Processor specific defines | 280 | * Processor specific defines |
| 272 | * --------------------------------------------------------------------------- | 281 | * --------------------------------------------------------------------------- |