diff options
Diffstat (limited to 'arch/arm/plat-samsung/include/plat')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/debug-macro.S | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/plat-samsung/include/plat/debug-macro.S b/arch/arm/plat-samsung/include/plat/debug-macro.S index 207e275362a8..f3a9cff6d5d4 100644 --- a/arch/arm/plat-samsung/include/plat/debug-macro.S +++ b/arch/arm/plat-samsung/include/plat/debug-macro.S | |||
@@ -14,12 +14,12 @@ | |||
14 | /* The S5PV210/S5PC110 implementations are as belows. */ | 14 | /* The S5PV210/S5PC110 implementations are as belows. */ |
15 | 15 | ||
16 | .macro fifo_level_s5pv210 rd, rx | 16 | .macro fifo_level_s5pv210 rd, rx |
17 | ldr \rd, [ \rx, # S3C2410_UFSTAT ] | 17 | ldr \rd, [\rx, # S3C2410_UFSTAT] |
18 | and \rd, \rd, #S5PV210_UFSTAT_TXMASK | 18 | and \rd, \rd, #S5PV210_UFSTAT_TXMASK |
19 | .endm | 19 | .endm |
20 | 20 | ||
21 | .macro fifo_full_s5pv210 rd, rx | 21 | .macro fifo_full_s5pv210 rd, rx |
22 | ldr \rd, [ \rx, # S3C2410_UFSTAT ] | 22 | ldr \rd, [\rx, # S3C2410_UFSTAT] |
23 | tst \rd, #S5PV210_UFSTAT_TXFULL | 23 | tst \rd, #S5PV210_UFSTAT_TXFULL |
24 | .endm | 24 | .endm |
25 | 25 | ||
@@ -27,7 +27,7 @@ | |||
27 | * most widely re-used */ | 27 | * most widely re-used */ |
28 | 28 | ||
29 | .macro fifo_level_s3c2440 rd, rx | 29 | .macro fifo_level_s3c2440 rd, rx |
30 | ldr \rd, [ \rx, # S3C2410_UFSTAT ] | 30 | ldr \rd, [\rx, # S3C2410_UFSTAT] |
31 | and \rd, \rd, #S3C2440_UFSTAT_TXMASK | 31 | and \rd, \rd, #S3C2440_UFSTAT_TXMASK |
32 | .endm | 32 | .endm |
33 | 33 | ||
@@ -36,7 +36,7 @@ | |||
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | .macro fifo_full_s3c2440 rd, rx | 38 | .macro fifo_full_s3c2440 rd, rx |
39 | ldr \rd, [ \rx, # S3C2410_UFSTAT ] | 39 | ldr \rd, [\rx, # S3C2410_UFSTAT] |
40 | tst \rd, #S3C2440_UFSTAT_TXFULL | 40 | tst \rd, #S3C2440_UFSTAT_TXFULL |
41 | .endm | 41 | .endm |
42 | 42 | ||
@@ -45,11 +45,11 @@ | |||
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | .macro senduart,rd,rx | 47 | .macro senduart,rd,rx |
48 | strb \rd, [\rx, # S3C2410_UTXH ] | 48 | strb \rd, [\rx, # S3C2410_UTXH] |
49 | .endm | 49 | .endm |
50 | 50 | ||
51 | .macro busyuart, rd, rx | 51 | .macro busyuart, rd, rx |
52 | ldr \rd, [ \rx, # S3C2410_UFCON ] | 52 | ldr \rd, [\rx, # S3C2410_UFCON] |
53 | tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled? | 53 | tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled? |
54 | beq 1001f @ | 54 | beq 1001f @ |
55 | @ FIFO enabled... | 55 | @ FIFO enabled... |
@@ -60,7 +60,7 @@ | |||
60 | 60 | ||
61 | 1001: | 61 | 1001: |
62 | @ busy waiting for non fifo | 62 | @ busy waiting for non fifo |
63 | ldr \rd, [ \rx, # S3C2410_UTRSTAT ] | 63 | ldr \rd, [\rx, # S3C2410_UTRSTAT] |
64 | tst \rd, #S3C2410_UTRSTAT_TXFE | 64 | tst \rd, #S3C2410_UTRSTAT_TXFE |
65 | beq 1001b | 65 | beq 1001b |
66 | 66 | ||
@@ -68,7 +68,7 @@ | |||
68 | .endm | 68 | .endm |
69 | 69 | ||
70 | .macro waituart,rd,rx | 70 | .macro waituart,rd,rx |
71 | ldr \rd, [ \rx, # S3C2410_UFCON ] | 71 | ldr \rd, [\rx, # S3C2410_UFCON] |
72 | tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled? | 72 | tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled? |
73 | beq 1001f @ | 73 | beq 1001f @ |
74 | @ FIFO enabled... | 74 | @ FIFO enabled... |
@@ -79,7 +79,7 @@ | |||
79 | b 1002f | 79 | b 1002f |
80 | 1001: | 80 | 1001: |
81 | @ idle waiting for non fifo | 81 | @ idle waiting for non fifo |
82 | ldr \rd, [ \rx, # S3C2410_UTRSTAT ] | 82 | ldr \rd, [\rx, # S3C2410_UTRSTAT] |
83 | tst \rd, #S3C2410_UTRSTAT_TXFE | 83 | tst \rd, #S3C2410_UTRSTAT_TXFE |
84 | beq 1001b | 84 | beq 1001b |
85 | 85 | ||