Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 326954
b: refs/heads/master
c: afc4917
h: refs/heads/master
v: v3
  • Loading branch information
Alexander Shiyan authored and Arnd Bergmann committed Sep 28, 2012
1 parent 56ba752 commit ceaaab6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7255f87a7169689be2d4722375744a1f932d4b28
refs/heads/master: afc49177b412dfe547c60740ac1f1db7f805da43
9 changes: 4 additions & 5 deletions trunk/arch/arm/mach-clps711x/include/mach/clps711x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
#define PBDDR (0x0041)
#define PCDDR (0x0042)
#define PDDDR (0x0043)
#define PEDR (0x0080)
#define PEDDR (0x00c0)
#define PEDR (0x0083)
#define PEDDR (0x00c3)
#define SYSCON1 (0x0100)
#define SYSFLG1 (0x0140)
#define MEMCFG1 (0x0180)
Expand Down Expand Up @@ -77,7 +77,7 @@
#define KBDEOI (0x1700)

#define DAIR (0x2000)
#define DAIR0 (0x2040)
#define DAIDR0 (0x2040)
#define DAIDR1 (0x2080)
#define DAIDR2 (0x20c0)
#define DAISR (0x2100)
Expand Down Expand Up @@ -191,8 +191,7 @@
#define UBRLCR_WRDLEN8 (3 << 17)
#define UBRLCR_WRDLEN_MASK (3 << 17)

#define SYNCIO_FRMLEN(x) (((x) & 0x3f) << 7)
#define SYNCIO_CFGLEN(x) ((x) & 0x7f)
#define SYNCIO_FRMLEN(x) (((x) & 0x1f) << 8)
#define SYNCIO_SMCKEN (1 << 13)
#define SYNCIO_TXFRMEN (1 << 14)

Expand Down

0 comments on commit ceaaab6

Please sign in to comment.