diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
| commit | 43d2548bb2ef7e6d753f91468a746784041e522d (patch) | |
| tree | 77d13fcd48fd998393abb825ec36e2b732684a73 /include/asm-mips | |
| parent | 585583d95c5660973bc0cf64add517b040acd8a4 (diff) | |
| parent | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (diff) | |
Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
Manual fixup of:
arch/powerpc/Kconfig
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/mach-au1x00/au1xxx_psc.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-mips/mach-au1x00/au1xxx_psc.h b/include/asm-mips/mach-au1x00/au1xxx_psc.h index dae4eca2417e..892b7f168eb4 100644 --- a/include/asm-mips/mach-au1x00/au1xxx_psc.h +++ b/include/asm-mips/mach-au1x00/au1xxx_psc.h | |||
| @@ -204,6 +204,14 @@ typedef struct psc_i2s { | |||
| 204 | u32 psc_i2sudf; | 204 | u32 psc_i2sudf; |
| 205 | } psc_i2s_t; | 205 | } psc_i2s_t; |
| 206 | 206 | ||
| 207 | #define PSC_I2SCFG_OFFSET 0x08 | ||
| 208 | #define PSC_I2SMASK_OFFSET 0x0C | ||
| 209 | #define PSC_I2SPCR_OFFSET 0x10 | ||
| 210 | #define PSC_I2SSTAT_OFFSET 0x14 | ||
| 211 | #define PSC_I2SEVENT_OFFSET 0x18 | ||
| 212 | #define PSC_I2SRXTX_OFFSET 0x1C | ||
| 213 | #define PSC_I2SUDF_OFFSET 0x20 | ||
| 214 | |||
| 207 | /* I2S Config Register. */ | 215 | /* I2S Config Register. */ |
| 208 | #define PSC_I2SCFG_RT_MASK (3 << 30) | 216 | #define PSC_I2SCFG_RT_MASK (3 << 30) |
| 209 | #define PSC_I2SCFG_RT_FIFO1 (0 << 30) | 217 | #define PSC_I2SCFG_RT_FIFO1 (0 << 30) |