diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-11-17 01:15:01 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-12-15 00:16:16 -0500 |
commit | 31ad0e27ed71c30cd328b503ce6163392b4dd9e2 (patch) | |
tree | 6b0a3ef8380fd5f9d44f53c892e46b144e20ff0e /arch/blackfin/mach-bf518/include/mach/cdefBF516.h | |
parent | b1740549d493d3ea5d16bee1cdc7b1f200163ad5 (diff) |
Blackfin: BF51x: unify def/cdef headers
Whole lot of duplicated code here just went bye bye.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-bf518/include/mach/cdefBF516.h')
-rw-r--r-- | arch/blackfin/mach-bf518/include/mach/cdefBF516.h | 80 |
1 files changed, 3 insertions, 77 deletions
diff --git a/arch/blackfin/mach-bf518/include/mach/cdefBF516.h b/arch/blackfin/mach-bf518/include/mach/cdefBF516.h index 6b364eda494..2751592ef1c 100644 --- a/arch/blackfin/mach-bf518/include/mach/cdefBF516.h +++ b/arch/blackfin/mach-bf518/include/mach/cdefBF516.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright 2008-2009 Analog Devices Inc. | 2 | * Copyright 2008-2009 Analog Devices Inc. |
3 | * | 3 | * |
4 | * Licensed under the GPL-2 or later | 4 | * Licensed under the ADI BSD license or the GPL-2 (or later) |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #ifndef _CDEF_BF516_H | 7 | #ifndef _CDEF_BF516_H |
@@ -10,15 +10,8 @@ | |||
10 | /* include all Core registers and bit definitions */ | 10 | /* include all Core registers and bit definitions */ |
11 | #include "defBF516.h" | 11 | #include "defBF516.h" |
12 | 12 | ||
13 | /* include core specific register pointer definitions */ | 13 | /* BF516 is BF514 + EMAC */ |
14 | #include <asm/cdef_LPBlackfin.h> | 14 | #include "cdefBF514.h" |
15 | |||
16 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF516 */ | ||
17 | |||
18 | /* include cdefBF51x_base.h for the set of #defines that are common to all ADSP-BF51x processors */ | ||
19 | #include "cdefBF51x_base.h" | ||
20 | |||
21 | /* The following are the #defines needed by ADSP-BF516 that are not in the common header */ | ||
22 | 15 | ||
23 | /* 10/100 Ethernet Controller (0xFFC03000 - 0xFFC031FF) */ | 16 | /* 10/100 Ethernet Controller (0xFFC03000 - 0xFFC031FF) */ |
24 | 17 | ||
@@ -185,71 +178,4 @@ | |||
185 | #define bfin_read_EMAC_TXC_ABORT() bfin_read32(EMAC_TXC_ABORT) | 178 | #define bfin_read_EMAC_TXC_ABORT() bfin_read32(EMAC_TXC_ABORT) |
186 | #define bfin_write_EMAC_TXC_ABORT(val) bfin_write32(EMAC_TXC_ABORT, val) | 179 | #define bfin_write_EMAC_TXC_ABORT(val) bfin_write32(EMAC_TXC_ABORT, val) |
187 | 180 | ||
188 | /* Removable Storage Interface Registers */ | ||
189 | |||
190 | #define bfin_read_RSI_PWR_CTL() bfin_read16(RSI_PWR_CONTROL) | ||
191 | #define bfin_write_RSI_PWR_CTL(val) bfin_write16(RSI_PWR_CONTROL, val) | ||
192 | #define bfin_read_RSI_CLK_CTL() bfin_read16(RSI_CLK_CONTROL) | ||
193 | #define bfin_write_RSI_CLK_CTL(val) bfin_write16(RSI_CLK_CONTROL, val) | ||
194 | #define bfin_read_RSI_ARGUMENT() bfin_read32(RSI_ARGUMENT) | ||
195 | #define bfin_write_RSI_ARGUMENT(val) bfin_write32(RSI_ARGUMENT, val) | ||
196 | #define bfin_read_RSI_COMMAND() bfin_read16(RSI_COMMAND) | ||
197 | #define bfin_write_RSI_COMMAND(val) bfin_write16(RSI_COMMAND, val) | ||
198 | #define bfin_read_RSI_RESP_CMD() bfin_read16(RSI_RESP_CMD) | ||
199 | #define bfin_write_RSI_RESP_CMD(val) bfin_write16(RSI_RESP_CMD, val) | ||
200 | #define bfin_read_RSI_RESPONSE0() bfin_read32(RSI_RESPONSE0) | ||
201 | #define bfin_write_RSI_RESPONSE0(val) bfin_write32(RSI_RESPONSE0, val) | ||
202 | #define bfin_read_RSI_RESPONSE1() bfin_read32(RSI_RESPONSE1) | ||
203 | #define bfin_write_RSI_RESPONSE1(val) bfin_write32(RSI_RESPONSE1, val) | ||
204 | #define bfin_read_RSI_RESPONSE2() bfin_read32(RSI_RESPONSE2) | ||
205 | #define bfin_write_RSI_RESPONSE2(val) bfin_write32(RSI_RESPONSE2, val) | ||
206 | #define bfin_read_RSI_RESPONSE3() bfin_read32(RSI_RESPONSE3) | ||
207 | #define bfin_write_RSI_RESPONSE3(val) bfin_write32(RSI_RESPONSE3, val) | ||
208 | #define bfin_read_RSI_DATA_TIMER() bfin_read32(RSI_DATA_TIMER) | ||
209 | #define bfin_write_RSI_DATA_TIMER(val) bfin_write32(RSI_DATA_TIMER, val) | ||
210 | #define bfin_read_RSI_DATA_LGTH() bfin_read16(RSI_DATA_LGTH) | ||
211 | #define bfin_write_RSI_DATA_LGTH(val) bfin_write16(RSI_DATA_LGTH, val) | ||
212 | #define bfin_read_RSI_DATA_CTL() bfin_read16(RSI_DATA_CONTROL) | ||
213 | #define bfin_write_RSI_DATA_CTL(val) bfin_write16(RSI_DATA_CONTROL, val) | ||
214 | #define bfin_read_RSI_DATA_CNT() bfin_read16(RSI_DATA_CNT) | ||
215 | #define bfin_write_RSI_DATA_CNT(val) bfin_write16(RSI_DATA_CNT, val) | ||
216 | #define bfin_read_RSI_STATUS() bfin_read32(RSI_STATUS) | ||
217 | #define bfin_write_RSI_STATUS(val) bfin_write32(RSI_STATUS, val) | ||
218 | #define bfin_read_RSI_STATUS_CLR() bfin_read16(RSI_STATUSCL) | ||
219 | #define bfin_write_RSI_STATUS_CLR(val) bfin_write16(RSI_STATUSCL, val) | ||
220 | #define bfin_read_RSI_MASK0() bfin_read32(RSI_MASK0) | ||
221 | #define bfin_write_RSI_MASK0(val) bfin_write32(RSI_MASK0, val) | ||
222 | #define bfin_read_RSI_MASK1() bfin_read32(RSI_MASK1) | ||
223 | #define bfin_write_RSI_MASK1(val) bfin_write32(RSI_MASK1, val) | ||
224 | #define bfin_read_RSI_FIFO_CNT() bfin_read16(RSI_FIFO_CNT) | ||
225 | #define bfin_write_RSI_FIFO_CNT(val) bfin_write16(RSI_FIFO_CNT, val) | ||
226 | #define bfin_read_RSI_CEATA_CTL() bfin_read16(RSI_CEATA_CONTROL) | ||
227 | #define bfin_write_RSI_CEATA_CTL(val) bfin_write16(RSI_CEATA_CONTROL, val) | ||
228 | #define bfin_read_RSI_FIFO() bfin_read32(RSI_FIFO) | ||
229 | #define bfin_write_RSI_FIFO(val) bfin_write32(RSI_FIFO, val) | ||
230 | #define bfin_read_RSI_E_STATUS() bfin_read16(RSI_ESTAT) | ||
231 | #define bfin_write_RSI_E_STATUS(val) bfin_write16(RSI_ESTAT, val) | ||
232 | #define bfin_read_RSI_E_MASK() bfin_read16(RSI_EMASK) | ||
233 | #define bfin_write_RSI_E_MASK(val) bfin_write16(RSI_EMASK, val) | ||
234 | #define bfin_read_RSI_CFG() bfin_read16(RSI_CONFIG) | ||
235 | #define bfin_write_RSI_CFG(val) bfin_write16(RSI_CONFIG, val) | ||
236 | #define bfin_read_RSI_RD_WAIT_EN() bfin_read16(RSI_RD_WAIT_EN) | ||
237 | #define bfin_write_RSI_RD_WAIT_EN(val) bfin_write16(RSI_RD_WAIT_EN, val) | ||
238 | #define bfin_read_RSI_PID0() bfin_read16(RSI_PID0) | ||
239 | #define bfin_write_RSI_PID0(val) bfin_write16(RSI_PID0, val) | ||
240 | #define bfin_read_RSI_PID1() bfin_read16(RSI_PID1) | ||
241 | #define bfin_write_RSI_PID1(val) bfin_write16(RSI_PID1, val) | ||
242 | #define bfin_read_RSI_PID2() bfin_read16(RSI_PID2) | ||
243 | #define bfin_write_RSI_PID2(val) bfin_write16(RSI_PID2, val) | ||
244 | #define bfin_read_RSI_PID3() bfin_read16(RSI_PID3) | ||
245 | #define bfin_write_RSI_PID3(val) bfin_write16(RSI_PID3, val) | ||
246 | #define bfin_read_RSI_PID4() bfin_read16(RSI_PID4) | ||
247 | #define bfin_write_RSI_PID4(val) bfin_write16(RSI_PID4, val) | ||
248 | #define bfin_read_RSI_PID5() bfin_read16(RSI_PID5) | ||
249 | #define bfin_write_RSI_PID5(val) bfin_write16(RSI_PID5, val) | ||
250 | #define bfin_read_RSI_PID6() bfin_read16(RSI_PID6) | ||
251 | #define bfin_write_RSI_PID6(val) bfin_write16(RSI_PID6, val) | ||
252 | #define bfin_read_RSI_PID7() bfin_read16(RSI_PID7) | ||
253 | #define bfin_write_RSI_PID7(val) bfin_write16(RSI_PID7, val) | ||
254 | |||
255 | #endif /* _CDEF_BF516_H */ | 181 | #endif /* _CDEF_BF516_H */ |