diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:19:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:19:26 -0400 |
| commit | 73c583e4e2dd0fbbf2fafe0cc57ff75314fe72df (patch) | |
| tree | b2fb05a6d199c0f6653fff84b67159af8f228760 /arch/arm/mach-omap1/sram.S | |
| parent | 5ce00289875a853280985aee671258795b77e089 (diff) | |
| parent | 1f685b36dbf27db55072fb738aac57aaf37d2c71 (diff) | |
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (47 commits)
OMAP clock: use debugfs_remove_recursive() for rewinding
OMAP2/3/4 core: create omap_device layer
OMAP: omap_hwmod: call omap_hwmod init at boot; create interconnects
OMAP2/3/4: create omap_hwmod layer
OMAP2/3 board-*.c files: read bootloader configuration earlier
OMAP2/3/4 PRCM: add module IDLEST wait code
OMAP2/3 PM: create the OMAP PM interface and add a default OMAP PM no-op layer
OMAP3 clock: remove superfluous calls to omap2_init_clk_clkdm
OMAP clock: associate MPU clocks with the mpu_clkdm
OMAP3 clock: Fixed processing of bootarg 'mpurate'
OMAP: SDRC: Add several new register definitions
OMAP: powerdomain: Fix overflow when doing powerdomain deps lookups.
OMAP: PM: Added suspend target state control to debugfs for OMAP3
OMAP: PM debug: Add PRCM register dump support
OMAP: PM debug: make powerdomains use PM-debug counters
OMAP: PM: Add pm-debug counters
OMAP: PM: Add closures to clkdm_for_each and pwrdm_for_each.
OMAP: PM: Hook into PM counters
OMAP: PM counter infrastructure.
OMAP3: PM: fix lockdep warning caused by omap3_pm_init
...
Diffstat (limited to 'arch/arm/mach-omap1/sram.S')
| -rw-r--r-- | arch/arm/mach-omap1/sram.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/sram.S b/arch/arm/mach-omap1/sram.S index 261cdc48228b..7724e520d07c 100644 --- a/arch/arm/mach-omap1/sram.S +++ b/arch/arm/mach-omap1/sram.S | |||
| @@ -21,13 +21,13 @@ | |||
| 21 | ENTRY(omap1_sram_reprogram_clock) | 21 | ENTRY(omap1_sram_reprogram_clock) |
| 22 | stmfd sp!, {r0 - r12, lr} @ save registers on stack | 22 | stmfd sp!, {r0 - r12, lr} @ save registers on stack |
| 23 | 23 | ||
| 24 | mov r2, #IO_ADDRESS(DPLL_CTL) & 0xff000000 | 24 | mov r2, #OMAP1_IO_ADDRESS(DPLL_CTL) & 0xff000000 |
| 25 | orr r2, r2, #IO_ADDRESS(DPLL_CTL) & 0x00ff0000 | 25 | orr r2, r2, #OMAP1_IO_ADDRESS(DPLL_CTL) & 0x00ff0000 |
| 26 | orr r2, r2, #IO_ADDRESS(DPLL_CTL) & 0x0000ff00 | 26 | orr r2, r2, #OMAP1_IO_ADDRESS(DPLL_CTL) & 0x0000ff00 |
| 27 | 27 | ||
| 28 | mov r3, #IO_ADDRESS(ARM_CKCTL) & 0xff000000 | 28 | mov r3, #OMAP1_IO_ADDRESS(ARM_CKCTL) & 0xff000000 |
| 29 | orr r3, r3, #IO_ADDRESS(ARM_CKCTL) & 0x00ff0000 | 29 | orr r3, r3, #OMAP1_IO_ADDRESS(ARM_CKCTL) & 0x00ff0000 |
| 30 | orr r3, r3, #IO_ADDRESS(ARM_CKCTL) & 0x0000ff00 | 30 | orr r3, r3, #OMAP1_IO_ADDRESS(ARM_CKCTL) & 0x0000ff00 |
| 31 | 31 | ||
| 32 | tst r0, #1 << 4 @ want lock mode? | 32 | tst r0, #1 << 4 @ want lock mode? |
| 33 | beq newck @ nope | 33 | beq newck @ nope |