diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 13:00:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 13:00:22 -0400 |
commit | d07b3c25327c5ae3792d0ed0c135dee4727200a1 (patch) | |
tree | 2ffad8da1f9004bdeb32bf76faa08fa104797b89 /arch/arm/mach-omap2 | |
parent | dde33348e53ecab687a9768bf5262f0b8f79b7f2 (diff) | |
parent | 6cbdc8c5357276307a77deeada3f04626ff17da6 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits)
[ARM] spelling fixes
[ARM] at91_adc parenthesis balance
[ARM] 4400/1: S3C24XX: Add high-speed MMC device definition
[ARM] 4399/2: S3C2443: Fix SMDK2443 nand timings
[ARM] 4398/1: S3C2443: Fix watchdog IRQ number
[ARM] 4397/1: S3C2443: remove SDI0/1 IRQ ambiguity
[ARM] 4396/1: S3C2443: Add missing HCLK clocks
[ARM] 4395/1: S3C24XX: add include of <linux/sysdev.h> to relevant machines
[ARM] 4388/1: no need for arm/mm mmap range checks for non-mmu
[ARM] 4387/1: fix /proc/cpuinfo formatting for pre-ARM7 parts
[ARM] ARMv6: add CPU_HAS_ASID configuration
[ARM] integrator: fix pci_v3 compile error with DEBUG_LL
[ARM] gic: Fix gic cascade irq handling
[ARM] Silence OMAP kernel configuration warning
[ARM] Update ARM syscalls
[ARM] 4384/1: S3C2412/13 SPI registers offset correction
[ARM] 4383/1: iop: fix usage of '__init' and 'inline' in iop files
[ARM] 4382/1: iop13xx: fix msi support
[ARM] Remove Integrator/CP SMP platform support
[ARM] 4378/1: KS8695: Serial driver fix
...
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 5170481afeab..588adb5ab47f 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
@@ -443,7 +443,7 @@ static long omap2_clk_round_rate(struct clk *clk, unsigned long rate) | |||
443 | 443 | ||
444 | /* | 444 | /* |
445 | * Check the DLL lock state, and return tue if running in unlock mode. | 445 | * Check the DLL lock state, and return tue if running in unlock mode. |
446 | * This is needed to compenste for the shifted DLL value in unlock mode. | 446 | * This is needed to compensate for the shifted DLL value in unlock mode. |
447 | */ | 447 | */ |
448 | static u32 omap2_dll_force_needed(void) | 448 | static u32 omap2_dll_force_needed(void) |
449 | { | 449 | { |
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h index 162978fd5359..4f791866b910 100644 --- a/arch/arm/mach-omap2/clock.h +++ b/arch/arm/mach-omap2/clock.h | |||
@@ -338,7 +338,7 @@ struct prcm_config { | |||
338 | /* | 338 | /* |
339 | * These represent optimal values for common parts, it won't work for all. | 339 | * These represent optimal values for common parts, it won't work for all. |
340 | * As long as you scale down, most parameters are still work, they just | 340 | * As long as you scale down, most parameters are still work, they just |
341 | * become sub-optimal. The RFR value goes in the oppisite direction. If you | 341 | * become sub-optimal. The RFR value goes in the opposite direction. If you |
342 | * don't adjust it down as your clock period increases the refresh interval | 342 | * don't adjust it down as your clock period increases the refresh interval |
343 | * will not be met. Setting all parameters for complete worst case may work, | 343 | * will not be met. Setting all parameters for complete worst case may work, |
344 | * but may cut memory performance by 2x. Due to errata the DLLs need to be | 344 | * but may cut memory performance by 2x. Due to errata the DLLs need to be |
@@ -384,7 +384,7 @@ struct prcm_config { | |||
384 | * Filling in table based on H4 boards and 2430-SDPs variants available. | 384 | * Filling in table based on H4 boards and 2430-SDPs variants available. |
385 | * There are quite a few more rates combinations which could be defined. | 385 | * There are quite a few more rates combinations which could be defined. |
386 | * | 386 | * |
387 | * When multiple values are defiend the start up will try and choose the | 387 | * When multiple values are defined the start up will try and choose the |
388 | * fastest one. If a 'fast' value is defined, then automatically, the /2 | 388 | * fastest one. If a 'fast' value is defined, then automatically, the /2 |
389 | * one should be included as it can be used. Generally having more that | 389 | * one should be included as it can be used. Generally having more that |
390 | * one fast set does not make sense, as static timings need to be changed | 390 | * one fast set does not make sense, as static timings need to be changed |