diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2012-08-21 12:59:33 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 15:14:07 -0400 |
commit | afc49177b412dfe547c60740ac1f1db7f805da43 (patch) | |
tree | 76f6d587823cdf92236eccd4a184fa6233075172 | |
parent | 7255f87a7169689be2d4722375744a1f932d4b28 (diff) |
ARM: clps711x: Fix register definitions
This patch contain some fixes:
- Fixes the address of register PORTE.
- Corrects name for DAIDR0 register.
- Removes unused definition for SYNCIO_CFGLEN.
- Fixes definition SYNCIO_FRMLEN.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/clps711x.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-clps711x/include/mach/clps711x.h b/arch/arm/mach-clps711x/include/mach/clps711x.h index 1dd806f2847e..c82e21ca49c7 100644 --- a/arch/arm/mach-clps711x/include/mach/clps711x.h +++ b/arch/arm/mach-clps711x/include/mach/clps711x.h | |||
@@ -31,8 +31,8 @@ | |||
31 | #define PBDDR (0x0041) | 31 | #define PBDDR (0x0041) |
32 | #define PCDDR (0x0042) | 32 | #define PCDDR (0x0042) |
33 | #define PDDDR (0x0043) | 33 | #define PDDDR (0x0043) |
34 | #define PEDR (0x0080) | 34 | #define PEDR (0x0083) |
35 | #define PEDDR (0x00c0) | 35 | #define PEDDR (0x00c3) |
36 | #define SYSCON1 (0x0100) | 36 | #define SYSCON1 (0x0100) |
37 | #define SYSFLG1 (0x0140) | 37 | #define SYSFLG1 (0x0140) |
38 | #define MEMCFG1 (0x0180) | 38 | #define MEMCFG1 (0x0180) |
@@ -77,7 +77,7 @@ | |||
77 | #define KBDEOI (0x1700) | 77 | #define KBDEOI (0x1700) |
78 | 78 | ||
79 | #define DAIR (0x2000) | 79 | #define DAIR (0x2000) |
80 | #define DAIR0 (0x2040) | 80 | #define DAIDR0 (0x2040) |
81 | #define DAIDR1 (0x2080) | 81 | #define DAIDR1 (0x2080) |
82 | #define DAIDR2 (0x20c0) | 82 | #define DAIDR2 (0x20c0) |
83 | #define DAISR (0x2100) | 83 | #define DAISR (0x2100) |
@@ -191,8 +191,7 @@ | |||
191 | #define UBRLCR_WRDLEN8 (3 << 17) | 191 | #define UBRLCR_WRDLEN8 (3 << 17) |
192 | #define UBRLCR_WRDLEN_MASK (3 << 17) | 192 | #define UBRLCR_WRDLEN_MASK (3 << 17) |
193 | 193 | ||
194 | #define SYNCIO_FRMLEN(x) (((x) & 0x3f) << 7) | 194 | #define SYNCIO_FRMLEN(x) (((x) & 0x1f) << 8) |
195 | #define SYNCIO_CFGLEN(x) ((x) & 0x7f) | ||
196 | #define SYNCIO_SMCKEN (1 << 13) | 195 | #define SYNCIO_SMCKEN (1 << 13) |
197 | #define SYNCIO_TXFRMEN (1 << 14) | 196 | #define SYNCIO_TXFRMEN (1 << 14) |
198 | 197 | ||