diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-10 23:54:50 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-10 23:54:50 (GMT) |
| commit | 1385a7ae654264fb2d9d3c6c3c7a3df28d29ab53 (patch) | |
| tree | 153944a51d888ca98ad35625d53e4df00f006316 /arch/arm/mach-pxa/include/mach/regs-ssp.h | |
| parent | 1db8508cf483dc1ecf66141f90a7c03659d69512 (diff) | |
| parent | f6f35bbe7c6494e66590cf519e21da2dd8d59e01 (diff) | |
| download | linux-fsl-qoriq-1385a7ae654264fb2d9d3c6c3c7a3df28d29ab53.tar.xz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] AACI: timeout will reach -1
[ARM] Storage class should be before const qualifier
[ARM] pxa: stop and disable IRQ for each DMA channels at startup
[ARM] pxa: make more SSCR0 bit definitions visible on multiple processors
[ARM] pxa: fix missing of __REG() definition for ac97 registers access
[ARM] pxa: fix NAND and MMC clock initialization for pxa3xx
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/regs-ssp.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/regs-ssp.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/regs-ssp.h b/arch/arm/mach-pxa/include/mach/regs-ssp.h index 3c04cde..cf31986 100644 --- a/arch/arm/mach-pxa/include/mach/regs-ssp.h +++ b/arch/arm/mach-pxa/include/mach/regs-ssp.h @@ -41,6 +41,9 @@ #elif defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) #define SSCR0_SCR (0x000fff00) /* Serial Clock Rate (mask) */ #define SSCR0_SerClkDiv(x) (((x) - 1) << 8) /* Divisor [1..4096] */ +#endif + +#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) #define SSCR0_EDSS (1 << 20) /* Extended data size select */ #define SSCR0_NCS (1 << 21) /* Network clock select */ #define SSCR0_RIM (1 << 22) /* Receive FIFO overrrun interrupt mask */ |