diff options
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/arch-aaec2000/aaec2000.h | 4 | ||||
-rw-r--r-- | include/asm-arm/dma-mapping.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/arch-aaec2000/aaec2000.h b/include/asm-arm/arch-aaec2000/aaec2000.h index 002227924b9f..a6d1ee0980f2 100644 --- a/include/asm-arm/arch-aaec2000/aaec2000.h +++ b/include/asm-arm/arch-aaec2000/aaec2000.h | |||
@@ -140,11 +140,11 @@ | |||
140 | #define TIMER3_CLEAR __REG(0x80000e0c) /* Timer 3 Clear Register */ | 140 | #define TIMER3_CLEAR __REG(0x80000e0c) /* Timer 3 Clear Register */ |
141 | 141 | ||
142 | /* Timer Control register bits */ | 142 | /* Timer Control register bits */ |
143 | #define TIMER_CTRL_ENABLE (1 << 7) /* Enable (Start° Timer */ | 143 | #define TIMER_CTRL_ENABLE (1 << 7) /* Enable (Start Timer) */ |
144 | #define TIMER_CTRL_PERIODIC (1 << 6) /* Periodic Running Mode */ | 144 | #define TIMER_CTRL_PERIODIC (1 << 6) /* Periodic Running Mode */ |
145 | #define TIMER_CTRL_FREE_RUNNING (0 << 6) /* Normal Running Mode */ | 145 | #define TIMER_CTRL_FREE_RUNNING (0 << 6) /* Normal Running Mode */ |
146 | #define TIMER_CTRL_CLKSEL_508K (1 << 3) /* 508KHz Clock select (Timer 1, 2) */ | 146 | #define TIMER_CTRL_CLKSEL_508K (1 << 3) /* 508KHz Clock select (Timer 1, 2) */ |
147 | #define TIMER_CTRL_CLKSEL_2K (0 << 3) /* 2KHz Clock Select (Timer 1, 2)*/ | 147 | #define TIMER_CTRL_CLKSEL_2K (0 << 3) /* 2KHz Clock Select (Timer 1, 2) */ |
148 | 148 | ||
149 | /* Power and State Control */ | 149 | /* Power and State Control */ |
150 | #define POWER_BASE __REG(0x80000400) | 150 | #define POWER_BASE __REG(0x80000400) |
diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h index 678134bf2475..1eb8aac43228 100644 --- a/include/asm-arm/dma-mapping.h +++ b/include/asm-arm/dma-mapping.h | |||
@@ -401,7 +401,7 @@ extern void dma_sync_sg_for_device(struct device*, struct scatterlist*, int, enu | |||
401 | * | 401 | * |
402 | * On the SA-1111, a bug limits DMA to only certain regions of RAM. | 402 | * On the SA-1111, a bug limits DMA to only certain regions of RAM. |
403 | * On the IXP425, the PCI inbound window is 64MB (256MB total RAM) | 403 | * On the IXP425, the PCI inbound window is 64MB (256MB total RAM) |
404 | * On some ADI engineering sytems, PCI inbound window is 32MB (12MB total RAM) | 404 | * On some ADI engineering systems, PCI inbound window is 32MB (12MB total RAM) |
405 | * | 405 | * |
406 | * The following are helper functions used by the dmabounce subystem | 406 | * The following are helper functions used by the dmabounce subystem |
407 | * | 407 | * |