aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/tty/hvc/hvc_dcc.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/tty/hvc/hvc_dcc.c b/drivers/tty/hvc/hvc_dcc.c
index 6470f63deb4b..155ec105e1c8 100644
--- a/drivers/tty/hvc/hvc_dcc.c
+++ b/drivers/tty/hvc/hvc_dcc.c
@@ -33,8 +33,7 @@
33static inline u32 __dcc_getstatus(void) 33static inline u32 __dcc_getstatus(void)
34{ 34{
35 u32 __ret; 35 u32 __ret;
36 36 asm volatile("mrc p14, 0, %0, c0, c1, 0 @ read comms ctrl reg"
37 asm("mrc p14, 0, %0, c0, c1, 0 @ read comms ctrl reg"
38 : "=r" (__ret) : : "cc"); 37 : "=r" (__ret) : : "cc");
39 38
40 return __ret; 39 return __ret;
@@ -46,7 +45,7 @@ static inline char __dcc_getchar(void)
46{ 45{
47 char __c; 46 char __c;
48 47
49 asm("get_wait: mrc p14, 0, pc, c0, c1, 0 \n\ 48 asm volatile("get_wait: mrc p14, 0, pc, c0, c1, 0 \n\
50 bne get_wait \n\ 49 bne get_wait \n\
51 mrc p14, 0, %0, c0, c5, 0 @ read comms data reg" 50 mrc p14, 0, %0, c0, c5, 0 @ read comms data reg"
52 : "=r" (__c) : : "cc"); 51 : "=r" (__c) : : "cc");
@@ -58,7 +57,7 @@ static inline char __dcc_getchar(void)
58{ 57{
59 char __c; 58 char __c;
60 59
61 asm("mrc p14, 0, %0, c0, c5, 0 @ read comms data reg" 60 asm volatile("mrc p14, 0, %0, c0, c5, 0 @ read comms data reg"
62 : "=r" (__c)); 61 : "=r" (__c));
63 62
64 return __c; 63 return __c;
@@ -68,7 +67,7 @@ static inline char __dcc_getchar(void)
68#if defined(CONFIG_CPU_V7) 67#if defined(CONFIG_CPU_V7)
69static inline void __dcc_putchar(char c) 68static inline void __dcc_putchar(char c)
70{ 69{
71 asm("put_wait: mrc p14, 0, pc, c0, c1, 0 \n\ 70 asm volatile("put_wait: mrc p14, 0, pc, c0, c1, 0 \n\
72 bcs put_wait \n\ 71 bcs put_wait \n\
73 mcr p14, 0, %0, c0, c5, 0 " 72 mcr p14, 0, %0, c0, c5, 0 "
74 : : "r" (c) : "cc"); 73 : : "r" (c) : "cc");
@@ -76,7 +75,7 @@ static inline void __dcc_putchar(char c)
76#else 75#else
77static inline void __dcc_putchar(char c) 76static inline void __dcc_putchar(char c)
78{ 77{
79 asm("mcr p14, 0, %0, c0, c5, 0 @ write a char" 78 asm volatile("mcr p14, 0, %0, c0, c5, 0 @ write a char"
80 : /* no output register */ 79 : /* no output register */
81 : "r" (c)); 80 : "r" (c));
82} 81}