Skip to content

L
linux
Commit c5b77b45 authored by Bob Liu's avatar Bob Liu Committed by Mike Frysinger
Browse files
Options

Blackfin: bf51x/bf52x: fix 16/32bit SPORT MMR helpers 

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: default avatarBob Liu <lliubbo@gmail.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent e5c17218
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h
View file @ c5b77b45
...@@ -262,14 +262,14 @@ ...@@ -262,14 +262,14 @@
#define bfin_write_SPORT0_TX(val) bfin_write32(SPORT0_TX, val) #define bfin_write_SPORT0_TX(val) bfin_write32(SPORT0_TX, val)
#define bfin_read_SPORT0_RX() bfin_read32(SPORT0_RX) #define bfin_read_SPORT0_RX() bfin_read32(SPORT0_RX)
#define bfin_write_SPORT0_RX(val) bfin_write32(SPORT0_RX, val) #define bfin_write_SPORT0_RX(val) bfin_write32(SPORT0_RX, val)
#define bfin_read_SPORT0_TX32() bfin_read32(SPORT0_TX32) #define bfin_read_SPORT0_TX32() bfin_read32(SPORT0_TX)
#define bfin_write_SPORT0_TX32(val) bfin_write32(SPORT0_TX32, val) #define bfin_write_SPORT0_TX32(val) bfin_write32(SPORT0_TX, val)
#define bfin_read_SPORT0_RX32() bfin_read32(SPORT0_RX32) #define bfin_read_SPORT0_RX32() bfin_read32(SPORT0_RX)
#define bfin_write_SPORT0_RX32(val) bfin_write32(SPORT0_RX32, val) #define bfin_write_SPORT0_RX32(val) bfin_write32(SPORT0_RX, val)
#define bfin_read_SPORT0_TX16() bfin_read16(SPORT0_TX16) #define bfin_read_SPORT0_TX16() bfin_read16(SPORT0_TX)
#define bfin_write_SPORT0_TX16(val) bfin_write16(SPORT0_TX16, val) #define bfin_write_SPORT0_TX16(val) bfin_write16(SPORT0_TX, val)
#define bfin_read_SPORT0_RX16() bfin_read16(SPORT0_RX16) #define bfin_read_SPORT0_RX16() bfin_read16(SPORT0_RX)
#define bfin_write_SPORT0_RX16(val) bfin_write16(SPORT0_RX16, val) #define bfin_write_SPORT0_RX16(val) bfin_write16(SPORT0_RX, val)
#define bfin_read_SPORT0_RCR1() bfin_read16(SPORT0_RCR1) #define bfin_read_SPORT0_RCR1() bfin_read16(SPORT0_RCR1)
#define bfin_write_SPORT0_RCR1(val) bfin_write16(SPORT0_RCR1, val) #define bfin_write_SPORT0_RCR1(val) bfin_write16(SPORT0_RCR1, val)
#define bfin_read_SPORT0_RCR2() bfin_read16(SPORT0_RCR2) #define bfin_read_SPORT0_RCR2() bfin_read16(SPORT0_RCR2)
...@@ -317,14 +317,14 @@ ...@@ -317,14 +317,14 @@
#define bfin_write_SPORT1_TX(val) bfin_write32(SPORT1_TX, val) #define bfin_write_SPORT1_TX(val) bfin_write32(SPORT1_TX, val)
#define bfin_read_SPORT1_RX() bfin_read32(SPORT1_RX) #define bfin_read_SPORT1_RX() bfin_read32(SPORT1_RX)
#define bfin_write_SPORT1_RX(val) bfin_write32(SPORT1_RX, val) #define bfin_write_SPORT1_RX(val) bfin_write32(SPORT1_RX, val)
#define bfin_read_SPORT1_TX32() bfin_read32(SPORT1_TX32) #define bfin_read_SPORT1_TX32() bfin_read32(SPORT1_TX)
#define bfin_write_SPORT1_TX32(val) bfin_write32(SPORT1_TX32, val) #define bfin_write_SPORT1_TX32(val) bfin_write32(SPORT1_TX, val)
#define bfin_read_SPORT1_RX32() bfin_read32(SPORT1_RX32) #define bfin_read_SPORT1_RX32() bfin_read32(SPORT1_RX)
#define bfin_write_SPORT1_RX32(val) bfin_write32(SPORT1_RX32, val) #define bfin_write_SPORT1_RX32(val) bfin_write32(SPORT1_RX, val)
#define bfin_read_SPORT1_TX16() bfin_read16(SPORT1_TX16) #define bfin_read_SPORT1_TX16() bfin_read16(SPORT1_TX)
#define bfin_write_SPORT1_TX16(val) bfin_write16(SPORT1_TX16, val) #define bfin_write_SPORT1_TX16(val) bfin_write16(SPORT1_TX, val)
#define bfin_read_SPORT1_RX16() bfin_read16(SPORT1_RX16) #define bfin_read_SPORT1_RX16() bfin_read16(SPORT1_RX)
#define bfin_write_SPORT1_RX16(val) bfin_write16(SPORT1_RX16, val) #define bfin_write_SPORT1_RX16(val) bfin_write16(SPORT1_RX, val)
#define bfin_read_SPORT1_RCR1() bfin_read16(SPORT1_RCR1) #define bfin_read_SPORT1_RCR1() bfin_read16(SPORT1_RCR1)
#define bfin_write_SPORT1_RCR1(val) bfin_write16(SPORT1_RCR1, val) #define bfin_write_SPORT1_RCR1(val) bfin_write16(SPORT1_RCR1, val)
#define bfin_read_SPORT1_RCR2() bfin_read16(SPORT1_RCR2) #define bfin_read_SPORT1_RCR2() bfin_read16(SPORT1_RCR2)
......
arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h
View file @ c5b77b45
...@@ -279,14 +279,14 @@ ...@@ -279,14 +279,14 @@
#define bfin_write_SPORT0_TX(val) bfin_write32(SPORT0_TX, val) #define bfin_write_SPORT0_TX(val) bfin_write32(SPORT0_TX, val)
#define bfin_read_SPORT0_RX() bfin_read32(SPORT0_RX) #define bfin_read_SPORT0_RX() bfin_read32(SPORT0_RX)
#define bfin_write_SPORT0_RX(val) bfin_write32(SPORT0_RX, val) #define bfin_write_SPORT0_RX(val) bfin_write32(SPORT0_RX, val)
#define bfin_read_SPORT0_TX32() bfin_read32(SPORT0_TX32) #define bfin_read_SPORT0_TX32() bfin_read32(SPORT0_TX)
#define bfin_write_SPORT0_TX32(val) bfin_write32(SPORT0_TX32, val) #define bfin_write_SPORT0_TX32(val) bfin_write32(SPORT0_TX, val)
#define bfin_read_SPORT0_RX32() bfin_read32(SPORT0_RX32) #define bfin_read_SPORT0_RX32() bfin_read32(SPORT0_RX)
#define bfin_write_SPORT0_RX32(val) bfin_write32(SPORT0_RX32, val) #define bfin_write_SPORT0_RX32(val) bfin_write32(SPORT0_RX, val)
#define bfin_read_SPORT0_TX16() bfin_read16(SPORT0_TX16) #define bfin_read_SPORT0_TX16() bfin_read16(SPORT0_TX)
#define bfin_write_SPORT0_TX16(val) bfin_write16(SPORT0_TX16, val) #define bfin_write_SPORT0_TX16(val) bfin_write16(SPORT0_TX, val)
#define bfin_read_SPORT0_RX16() bfin_read16(SPORT0_RX16) #define bfin_read_SPORT0_RX16() bfin_read16(SPORT0_RX)
#define bfin_write_SPORT0_RX16(val) bfin_write16(SPORT0_RX16, val) #define bfin_write_SPORT0_RX16(val) bfin_write16(SPORT0_RX, val)
#define bfin_read_SPORT0_RCR1() bfin_read16(SPORT0_RCR1) #define bfin_read_SPORT0_RCR1() bfin_read16(SPORT0_RCR1)
#define bfin_write_SPORT0_RCR1(val) bfin_write16(SPORT0_RCR1, val) #define bfin_write_SPORT0_RCR1(val) bfin_write16(SPORT0_RCR1, val)
#define bfin_read_SPORT0_RCR2() bfin_read16(SPORT0_RCR2) #define bfin_read_SPORT0_RCR2() bfin_read16(SPORT0_RCR2)
...@@ -334,14 +334,14 @@ ...@@ -334,14 +334,14 @@
#define bfin_write_SPORT1_TX(val) bfin_write32(SPORT1_TX, val) #define bfin_write_SPORT1_TX(val) bfin_write32(SPORT1_TX, val)
#define bfin_read_SPORT1_RX() bfin_read32(SPORT1_RX) #define bfin_read_SPORT1_RX() bfin_read32(SPORT1_RX)
#define bfin_write_SPORT1_RX(val) bfin_write32(SPORT1_RX, val) #define bfin_write_SPORT1_RX(val) bfin_write32(SPORT1_RX, val)
#define bfin_read_SPORT1_TX32() bfin_read32(SPORT1_TX32) #define bfin_read_SPORT1_TX32() bfin_read32(SPORT1_TX)
#define bfin_write_SPORT1_TX32(val) bfin_write32(SPORT1_TX32, val) #define bfin_write_SPORT1_TX32(val) bfin_write32(SPORT1_TX, val)
#define bfin_read_SPORT1_RX32() bfin_read32(SPORT1_RX32) #define bfin_read_SPORT1_RX32() bfin_read32(SPORT1_RX)
#define bfin_write_SPORT1_RX32(val) bfin_write32(SPORT1_RX32, val) #define bfin_write_SPORT1_RX32(val) bfin_write32(SPORT1_RX, val)
#define bfin_read_SPORT1_TX16() bfin_read16(SPORT1_TX16) #define bfin_read_SPORT1_TX16() bfin_read16(SPORT1_TX)
#define bfin_write_SPORT1_TX16(val) bfin_write16(SPORT1_TX16, val) #define bfin_write_SPORT1_TX16(val) bfin_write16(SPORT1_TX, val)
#define bfin_read_SPORT1_RX16() bfin_read16(SPORT1_RX16) #define bfin_read_SPORT1_RX16() bfin_read16(SPORT1_RX)
#define bfin_write_SPORT1_RX16(val) bfin_write16(SPORT1_RX16, val) #define bfin_write_SPORT1_RX16(val) bfin_write16(SPORT1_RX, val)
#define bfin_read_SPORT1_RCR1() bfin_read16(SPORT1_RCR1) #define bfin_read_SPORT1_RCR1() bfin_read16(SPORT1_RCR1)
#define bfin_write_SPORT1_RCR1(val) bfin_write16(SPORT1_RCR1, val) #define bfin_write_SPORT1_RCR1(val) bfin_write16(SPORT1_RCR1, val)
#define bfin_read_SPORT1_RCR2() bfin_read16(SPORT1_RCR2) #define bfin_read_SPORT1_RCR2() bfin_read16(SPORT1_RCR2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7