aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2012-05-14 13:46:09 -0400
committerArnd Bergmann <arnd@arndb.de>2012-05-14 14:36:46 -0400
commitb3ff9341ff828d38afe2799b1c7b4f37c1fcf411 (patch)
tree1ec6b15c9311db1266d3ed8c4085bdf491f18d47 /arch/arm
parent27723ec4ec7fab52e4e14ec35391390b296cb9d0 (diff)
ARM: clps711x: Added missing register definitions
This allows us to keep everything in a single place. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-clps711x/include/mach/clps711x.h46
1 files changed, 46 insertions, 0 deletions
diff --git a/arch/arm/mach-clps711x/include/mach/clps711x.h b/arch/arm/mach-clps711x/include/mach/clps711x.h
index 3e0759122ba8..1dd806f2847e 100644
--- a/arch/arm/mach-clps711x/include/mach/clps711x.h
+++ b/arch/arm/mach-clps711x/include/mach/clps711x.h
@@ -87,6 +87,14 @@
87#define LEDFLSH (0x22c0) 87#define LEDFLSH (0x22c0)
88#define SDCONF (0x2300) 88#define SDCONF (0x2300)
89#define SDRFPR (0x2340) 89#define SDRFPR (0x2340)
90#define UNIQID (0x2440)
91#define DAI64FS (0x2600)
92#define PLLW (0x2610)
93#define PLLR (0xa5a8)
94#define RANDID0 (0x2700)
95#define RANDID1 (0x2704)
96#define RANDID2 (0x2708)
97#define RANDID3 (0x270c)
90 98
91/* common bits: SYSCON1 / SYSCON2 */ 99/* common bits: SYSCON1 / SYSCON2 */
92#define SYSCON_UARTEN (1 << 8) 100#define SYSCON_UARTEN (1 << 8)
@@ -134,6 +142,8 @@
134#define SYSFLG1_CTXFF (1 << 25) 142#define SYSFLG1_CTXFF (1 << 25)
135#define SYSFLG1_SSIBUSY (1 << 26) 143#define SYSFLG1_SSIBUSY (1 << 26)
136#define SYSFLG1_ID (1 << 29) 144#define SYSFLG1_ID (1 << 29)
145#define SYSFLG1_VERID(x) (((x) >> 30) & 3)
146#define SYSFLG1_VERID_MASK (3 << 30)
137 147
138#define SYSFLG2_SSRXOF (1 << 0) 148#define SYSFLG2_SSRXOF (1 << 0)
139#define SYSFLG2_RESVAL (1 << 1) 149#define SYSFLG2_RESVAL (1 << 1)
@@ -181,9 +191,12 @@
181#define UBRLCR_WRDLEN8 (3 << 17) 191#define UBRLCR_WRDLEN8 (3 << 17)
182#define UBRLCR_WRDLEN_MASK (3 << 17) 192#define UBRLCR_WRDLEN_MASK (3 << 17)
183 193
194#define SYNCIO_FRMLEN(x) (((x) & 0x3f) << 7)
195#define SYNCIO_CFGLEN(x) ((x) & 0x7f)
184#define SYNCIO_SMCKEN (1 << 13) 196#define SYNCIO_SMCKEN (1 << 13)
185#define SYNCIO_TXFRMEN (1 << 14) 197#define SYNCIO_TXFRMEN (1 << 14)
186 198
199#define DAIR_RESERVED (0x0404)
187#define DAIR_DAIEN (1 << 16) 200#define DAIR_DAIEN (1 << 16)
188#define DAIR_ECS (1 << 17) 201#define DAIR_ECS (1 << 17)
189#define DAIR_LCTM (1 << 19) 202#define DAIR_LCTM (1 << 19)
@@ -210,11 +223,23 @@
210#define DAISR_LCNE (1 << 11) 223#define DAISR_LCNE (1 << 11)
211#define DAISR_FIFO (1 << 12) 224#define DAISR_FIFO (1 << 12)
212 225
226#define DAI64FS_I2SF64 (1 << 0)
227#define DAI64FS_AUDIOCLKEN (1 << 1)
228#define DAI64FS_AUDIOCLKSRC (1 << 2)
229#define DAI64FS_MCLK256EN (1 << 3)
230#define DAI64FS_LOOPBACK (1 << 5)
231
213#define SYSCON3_ADCCON (1 << 0) 232#define SYSCON3_ADCCON (1 << 0)
233#define SYSCON3_CLKCTL0 (1 << 1)
234#define SYSCON3_CLKCTL1 (1 << 2)
214#define SYSCON3_DAISEL (1 << 3) 235#define SYSCON3_DAISEL (1 << 3)
215#define SYSCON3_ADCCKNSEN (1 << 4) 236#define SYSCON3_ADCCKNSEN (1 << 4)
237#define SYSCON3_VERSN(x) (((x) >> 5) & 7)
238#define SYSCON3_VERSN_MASK (7 << 5)
216#define SYSCON3_FASTWAKE (1 << 8) 239#define SYSCON3_FASTWAKE (1 << 8)
217#define SYSCON3_DAIEN (1 << 9) 240#define SYSCON3_DAIEN (1 << 9)
241#define SYSCON3_128FS SYSCON3_DAIEN
242#define SYSCON3_ENPD67 (1 << 10)
218 243
219#define SDCONF_ACTIVE (1 << 10) 244#define SDCONF_ACTIVE (1 << 10)
220#define SDCONF_CLKCTL (1 << 9) 245#define SDCONF_CLKCTL (1 << 9)
@@ -229,4 +254,25 @@
229#define SDCONF_CASLAT_2 (2) 254#define SDCONF_CASLAT_2 (2)
230#define SDCONF_CASLAT_3 (3) 255#define SDCONF_CASLAT_3 (3)
231 256
257#define MEMCFG_BUS_WIDTH_32 (1)
258#define MEMCFG_BUS_WIDTH_16 (0)
259#define MEMCFG_BUS_WIDTH_8 (3)
260
261#define MEMCFG_WAITSTATE_8_3 (0 << 2)
262#define MEMCFG_WAITSTATE_7_3 (1 << 2)
263#define MEMCFG_WAITSTATE_6_3 (2 << 2)
264#define MEMCFG_WAITSTATE_5_3 (3 << 2)
265#define MEMCFG_WAITSTATE_4_2 (4 << 2)
266#define MEMCFG_WAITSTATE_3_2 (5 << 2)
267#define MEMCFG_WAITSTATE_2_2 (6 << 2)
268#define MEMCFG_WAITSTATE_1_2 (7 << 2)
269#define MEMCFG_WAITSTATE_8_1 (8 << 2)
270#define MEMCFG_WAITSTATE_7_1 (9 << 2)
271#define MEMCFG_WAITSTATE_6_1 (10 << 2)
272#define MEMCFG_WAITSTATE_5_1 (11 << 2)
273#define MEMCFG_WAITSTATE_4_0 (12 << 2)
274#define MEMCFG_WAITSTATE_3_0 (13 << 2)
275#define MEMCFG_WAITSTATE_2_0 (14 << 2)
276#define MEMCFG_WAITSTATE_1_0 (15 << 2)
277
232#endif /* __MACH_CLPS711X_H */ 278#endif /* __MACH_CLPS711X_H */