diff options
-rw-r--r-- | drivers/tty/hvc/hvc_dcc.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/tty/hvc/hvc_dcc.c b/drivers/tty/hvc/hvc_dcc.c index ad23cc8082a0..435f6facbc23 100644 --- a/drivers/tty/hvc/hvc_dcc.c +++ b/drivers/tty/hvc/hvc_dcc.c | |||
@@ -40,19 +40,6 @@ static inline u32 __dcc_getstatus(void) | |||
40 | } | 40 | } |
41 | 41 | ||
42 | 42 | ||
43 | #if defined(CONFIG_CPU_V7) | ||
44 | static inline char __dcc_getchar(void) | ||
45 | { | ||
46 | char __c; | ||
47 | |||
48 | asm volatile("get_wait: mrc p14, 0, pc, c0, c1, 0 \n\ | ||
49 | bne get_wait \n\ | ||
50 | mrc p14, 0, %0, c0, c5, 0 @ read comms data reg" | ||
51 | : "=r" (__c) : : "cc"); | ||
52 | |||
53 | return __c; | ||
54 | } | ||
55 | #else | ||
56 | static inline char __dcc_getchar(void) | 43 | static inline char __dcc_getchar(void) |
57 | { | 44 | { |
58 | char __c; | 45 | char __c; |
@@ -62,24 +49,13 @@ static inline char __dcc_getchar(void) | |||
62 | 49 | ||
63 | return __c; | 50 | return __c; |
64 | } | 51 | } |
65 | #endif | ||
66 | 52 | ||
67 | #if defined(CONFIG_CPU_V7) | ||
68 | static inline void __dcc_putchar(char c) | ||
69 | { | ||
70 | asm volatile("put_wait: mrc p14, 0, pc, c0, c1, 0 \n\ | ||
71 | bcs put_wait \n\ | ||
72 | mcr p14, 0, %0, c0, c5, 0 " | ||
73 | : : "r" (c) : "cc"); | ||
74 | } | ||
75 | #else | ||
76 | static inline void __dcc_putchar(char c) | 53 | static inline void __dcc_putchar(char c) |
77 | { | 54 | { |
78 | asm volatile("mcr p14, 0, %0, c0, c5, 0 @ write a char" | 55 | asm volatile("mcr p14, 0, %0, c0, c5, 0 @ write a char" |
79 | : /* no output register */ | 56 | : /* no output register */ |
80 | : "r" (c)); | 57 | : "r" (c)); |
81 | } | 58 | } |
82 | #endif | ||
83 | 59 | ||
84 | static int hvc_dcc_put_chars(uint32_t vt, const char *buf, int count) | 60 | static int hvc_dcc_put_chars(uint32_t vt, const char *buf, int count) |
85 | { | 61 | { |