Skip to content

Commit

Permalink
Blackfin: bf51x/bf52x: fix 16/32bit SPORT MMR helpers
Browse files Browse the repository at this point in the history 
The RX/TX address is always the same regardless of the size of the access.
That means there is no dedicated "16bit" or "32bit" MMR.  Trying to use
these currently leads to compile errors.  So change everything to use the
right MMR define.

Signed-off-by: Bob Liu <lliubbo@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
  • Loading branch information
Bob Liu authored and Mike Frysinger committed Oct 22, 2010
1 parent e5c1721 commit c5b77b4
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
32 changes: 16 additions & 16 deletions arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,14 +262,14 @@
#define bfin_write_SPORT0_TX(val) bfin_write32(SPORT0_TX, val)
#define bfin_read_SPORT0_RX() bfin_read32(SPORT0_RX)
#define bfin_write_SPORT0_RX(val) bfin_write32(SPORT0_RX, val)
#define bfin_read_SPORT0_TX32() bfin_read32(SPORT0_TX32)
#define bfin_write_SPORT0_TX32(val) bfin_write32(SPORT0_TX32, val)
#define bfin_read_SPORT0_RX32() bfin_read32(SPORT0_RX32)
#define bfin_write_SPORT0_RX32(val) bfin_write32(SPORT0_RX32, val)
#define bfin_read_SPORT0_TX16() bfin_read16(SPORT0_TX16)
#define bfin_write_SPORT0_TX16(val) bfin_write16(SPORT0_TX16, val)
#define bfin_read_SPORT0_RX16() bfin_read16(SPORT0_RX16)
#define bfin_write_SPORT0_RX16(val) bfin_write16(SPORT0_RX16, val)
#define bfin_read_SPORT0_TX32() bfin_read32(SPORT0_TX)
#define bfin_write_SPORT0_TX32(val) bfin_write32(SPORT0_TX, val)
#define bfin_read_SPORT0_RX32() bfin_read32(SPORT0_RX)
#define bfin_write_SPORT0_RX32(val) bfin_write32(SPORT0_RX, val)
#define bfin_read_SPORT0_TX16() bfin_read16(SPORT0_TX)
#define bfin_write_SPORT0_TX16(val) bfin_write16(SPORT0_TX, val)
#define bfin_read_SPORT0_RX16() bfin_read16(SPORT0_RX)
#define bfin_write_SPORT0_RX16(val) bfin_write16(SPORT0_RX, val)
#define bfin_read_SPORT0_RCR1() bfin_read16(SPORT0_RCR1)
#define bfin_write_SPORT0_RCR1(val) bfin_write16(SPORT0_RCR1, val)
#define bfin_read_SPORT0_RCR2() bfin_read16(SPORT0_RCR2)
Expand Down Expand Up @@ -317,14 +317,14 @@
#define bfin_write_SPORT1_TX(val) bfin_write32(SPORT1_TX, val)
#define bfin_read_SPORT1_RX() bfin_read32(SPORT1_RX)
#define bfin_write_SPORT1_RX(val) bfin_write32(SPORT1_RX, val)
#define bfin_read_SPORT1_TX32() bfin_read32(SPORT1_TX32)
#define bfin_write_SPORT1_TX32(val) bfin_write32(SPORT1_TX32, val)
#define bfin_read_SPORT1_RX32() bfin_read32(SPORT1_RX32)
#define bfin_write_SPORT1_RX32(val) bfin_write32(SPORT1_RX32, val)
#define bfin_read_SPORT1_TX16() bfin_read16(SPORT1_TX16)
#define bfin_write_SPORT1_TX16(val) bfin_write16(SPORT1_TX16, val)
#define bfin_read_SPORT1_RX16() bfin_read16(SPORT1_RX16)
#define bfin_write_SPORT1_RX16(val) bfin_write16(SPORT1_RX16, val)
#define bfin_read_SPORT1_TX32() bfin_read32(SPORT1_TX)
#define bfin_write_SPORT1_TX32(val) bfin_write32(SPORT1_TX, val)
#define bfin_read_SPORT1_RX32() bfin_read32(SPORT1_RX)
#define bfin_write_SPORT1_RX32(val) bfin_write32(SPORT1_RX, val)
#define bfin_read_SPORT1_TX16() bfin_read16(SPORT1_TX)
#define bfin_write_SPORT1_TX16(val) bfin_write16(SPORT1_TX, val)
#define bfin_read_SPORT1_RX16() bfin_read16(SPORT1_RX)
#define bfin_write_SPORT1_RX16(val) bfin_write16(SPORT1_RX, val)
#define bfin_read_SPORT1_RCR1() bfin_read16(SPORT1_RCR1)
#define bfin_write_SPORT1_RCR1(val) bfin_write16(SPORT1_RCR1, val)
#define bfin_read_SPORT1_RCR2() bfin_read16(SPORT1_RCR2)
Expand Down
32 changes: 16 additions & 16 deletions arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,14 +279,14 @@
#define bfin_write_SPORT0_TX(val) bfin_write32(SPORT0_TX, val)
#define bfin_read_SPORT0_RX() bfin_read32(SPORT0_RX)
#define bfin_write_SPORT0_RX(val) bfin_write32(SPORT0_RX, val)
#define bfin_read_SPORT0_TX32() bfin_read32(SPORT0_TX32)
#define bfin_write_SPORT0_TX32(val) bfin_write32(SPORT0_TX32, val)
#define bfin_read_SPORT0_RX32() bfin_read32(SPORT0_RX32)
#define bfin_write_SPORT0_RX32(val) bfin_write32(SPORT0_RX32, val)
#define bfin_read_SPORT0_TX16() bfin_read16(SPORT0_TX16)
#define bfin_write_SPORT0_TX16(val) bfin_write16(SPORT0_TX16, val)
#define bfin_read_SPORT0_RX16() bfin_read16(SPORT0_RX16)
#define bfin_write_SPORT0_RX16(val) bfin_write16(SPORT0_RX16, val)
#define bfin_read_SPORT0_TX32() bfin_read32(SPORT0_TX)
#define bfin_write_SPORT0_TX32(val) bfin_write32(SPORT0_TX, val)
#define bfin_read_SPORT0_RX32() bfin_read32(SPORT0_RX)
#define bfin_write_SPORT0_RX32(val) bfin_write32(SPORT0_RX, val)
#define bfin_read_SPORT0_TX16() bfin_read16(SPORT0_TX)
#define bfin_write_SPORT0_TX16(val) bfin_write16(SPORT0_TX, val)
#define bfin_read_SPORT0_RX16() bfin_read16(SPORT0_RX)
#define bfin_write_SPORT0_RX16(val) bfin_write16(SPORT0_RX, val)
#define bfin_read_SPORT0_RCR1() bfin_read16(SPORT0_RCR1)
#define bfin_write_SPORT0_RCR1(val) bfin_write16(SPORT0_RCR1, val)
#define bfin_read_SPORT0_RCR2() bfin_read16(SPORT0_RCR2)
Expand Down Expand Up @@ -334,14 +334,14 @@
#define bfin_write_SPORT1_TX(val) bfin_write32(SPORT1_TX, val)
#define bfin_read_SPORT1_RX() bfin_read32(SPORT1_RX)
#define bfin_write_SPORT1_RX(val) bfin_write32(SPORT1_RX, val)
#define bfin_read_SPORT1_TX32() bfin_read32(SPORT1_TX32)
#define bfin_write_SPORT1_TX32(val) bfin_write32(SPORT1_TX32, val)
#define bfin_read_SPORT1_RX32() bfin_read32(SPORT1_RX32)
#define bfin_write_SPORT1_RX32(val) bfin_write32(SPORT1_RX32, val)
#define bfin_read_SPORT1_TX16() bfin_read16(SPORT1_TX16)
#define bfin_write_SPORT1_TX16(val) bfin_write16(SPORT1_TX16, val)
#define bfin_read_SPORT1_RX16() bfin_read16(SPORT1_RX16)
#define bfin_write_SPORT1_RX16(val) bfin_write16(SPORT1_RX16, val)
#define bfin_read_SPORT1_TX32() bfin_read32(SPORT1_TX)
#define bfin_write_SPORT1_TX32(val) bfin_write32(SPORT1_TX, val)
#define bfin_read_SPORT1_RX32() bfin_read32(SPORT1_RX)
#define bfin_write_SPORT1_RX32(val) bfin_write32(SPORT1_RX, val)
#define bfin_read_SPORT1_TX16() bfin_read16(SPORT1_TX)
#define bfin_write_SPORT1_TX16(val) bfin_write16(SPORT1_TX, val)
#define bfin_read_SPORT1_RX16() bfin_read16(SPORT1_RX)
#define bfin_write_SPORT1_RX16(val) bfin_write16(SPORT1_RX, val)
#define bfin_read_SPORT1_RCR1() bfin_read16(SPORT1_RCR1)
#define bfin_write_SPORT1_RCR1(val) bfin_write16(SPORT1_RCR1, val)
#define bfin_read_SPORT1_RCR2() bfin_read16(SPORT1_RCR2)
Expand Down

0 comments on commit c5b77b4

Please sign in to comment.