projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e5c1721)
Blackfin: bf51x/bf52x: fix 16/32bit SPORT MMR helpers
authorBob Liu <lliubbo@gmail.com>
Wed, 29 Sep 2010 03:12:44 +0000 (03:12 +0000)
committerMike Frysinger <vapier@gentoo.org>
Fri, 22 Oct 2010 20:29:58 +0000 (16:29 -0400)
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>
arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h patch | blob | blame | history
arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h patch | blob | blame | history

diff --git a/arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h b/arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h
index 29498e59e71f4e7272fb38296abd8825115c0607..e16969f24ffd3c9cd8839ba209a34e17a19a6461 100644 (file)
--- a/arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h
+++ b/arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h
@@ -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)
@@ -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)
diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h
index 11fb27bc427dfa291b6d3cf017395e8779cfa9c0..3048b52bf46a720d4fb596c113aff131e1410b1f 100644 (file)
--- a/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h
+++ b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h
@@ -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)
@@ -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)