diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /include/asm-blackfin/mach-bf527/defBF52x_base.h | |
| parent | b160292cc216a50fd0cd386b0bda2cd48352c73b (diff) | |
| parent | 752097cec53eea111d087c545179b421e2bde98a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-blackfin/mach-bf527/defBF52x_base.h')
| -rw-r--r-- | include/asm-blackfin/mach-bf527/defBF52x_base.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-blackfin/mach-bf527/defBF52x_base.h b/include/asm-blackfin/mach-bf527/defBF52x_base.h index 0b2fb5036ed0..b1ff67db01f8 100644 --- a/include/asm-blackfin/mach-bf527/defBF52x_base.h +++ b/include/asm-blackfin/mach-bf527/defBF52x_base.h | |||
| @@ -102,6 +102,7 @@ | |||
| 102 | 102 | ||
| 103 | 103 | ||
| 104 | /* SPI Controller (0xFFC00500 - 0xFFC005FF) */ | 104 | /* SPI Controller (0xFFC00500 - 0xFFC005FF) */ |
| 105 | #define SPI0_REGBASE 0xFFC00500 | ||
| 105 | #define SPI_CTL 0xFFC00500 /* SPI Control Register */ | 106 | #define SPI_CTL 0xFFC00500 /* SPI Control Register */ |
| 106 | #define SPI_FLG 0xFFC00504 /* SPI Flag register */ | 107 | #define SPI_FLG 0xFFC00504 /* SPI Flag register */ |
| 107 | #define SPI_STAT 0xFFC00508 /* SPI Status register */ | 108 | #define SPI_STAT 0xFFC00508 /* SPI Status register */ |
| @@ -480,6 +481,7 @@ | |||
| 480 | 481 | ||
| 481 | 482 | ||
| 482 | /* Two-Wire Interface (0xFFC01400 - 0xFFC014FF) */ | 483 | /* Two-Wire Interface (0xFFC01400 - 0xFFC014FF) */ |
| 484 | #define TWI0_REGBASE 0xFFC01400 | ||
| 483 | #define TWI_CLKDIV 0xFFC01400 /* Serial Clock Divider Register */ | 485 | #define TWI_CLKDIV 0xFFC01400 /* Serial Clock Divider Register */ |
| 484 | #define TWI_CONTROL 0xFFC01404 /* TWI Control Register */ | 486 | #define TWI_CONTROL 0xFFC01404 /* TWI Control Register */ |
| 485 | #define TWI_SLAVE_CTL 0xFFC01408 /* Slave Mode Control Register */ | 487 | #define TWI_SLAVE_CTL 0xFFC01408 /* Slave Mode Control Register */ |