Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx

[oweals/u-boot.git] / cpu / mpc8220 / uart.c

diff --git a/cpu/mpc8220/uart.c b/cpu/mpc8220/uart.c
index 4ff8ccbf3f7c016045b0e0d064cbc4c8725184e2..0c4b536b48e7a09bdce55741abf20ba20b339a5a 100644 (file)
--- a/cpu/mpc8220/uart.c
+++ b/cpu/mpc8220/uart.c
@@ -30,12 +30,13 @@
 #include <common.h>
 #include <mpc8220.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define PSC_BASE   MMAP_PSC1
 
 #if defined(CONFIG_PSC_CONSOLE)
-int psc_serial_init (void)
+int serial_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        volatile psc8220_t *psc = (psc8220_t *) PSC_BASE;
        u32 counter;
 
@@ -47,7 +48,7 @@ int psc_serial_init (void)
        /* write to CSR: RX/TX baud rate from timers */
        psc->sr_csr = 0xdd000000;
 
-       psc->mr1_2 = PSC_MR1_BITS_CHAR_8 | PSC_MR1_NO_PARITY | PSC_MR2_STOP_BITS_1; 
+       psc->mr1_2 = PSC_MR1_BITS_CHAR_8 | PSC_MR1_NO_PARITY | PSC_MR2_STOP_BITS_1;
 
        /* Setting up BaudRate */
        counter = ((gd->bus_clk / gd->baudrate)) >> 5;
@@ -68,7 +69,7 @@ int psc_serial_init (void)
        return (0);
 }
 
-void psc_serial_putc (const char c)
+void serial_putc (const char c)
 {
        volatile psc8220_t *psc = (psc8220_t *) PSC_BASE;
 
@@ -81,14 +82,14 @@ void psc_serial_putc (const char c)
        psc->xmitbuf[0] = c;
 }
 
-void psc_serial_puts (const char *s)
+void serial_puts (const char *s)
 {
        while (*s) {
                serial_putc (*s++);
        }
 }
 
-int psc_serial_getc (void)
+int serial_getc (void)
 {
        volatile psc8220_t *psc = (psc8220_t *) PSC_BASE;
 
@@ -97,17 +98,15 @@ int psc_serial_getc (void)
        return psc->xmitbuf[2];
 }
 
-int psc_serial_tstc (void)
+int serial_tstc (void)
 {
        volatile psc8220_t *psc = (psc8220_t *) PSC_BASE;
 
        return (psc->sr_csr & PSC_SR_RXRDY);
 }
 
-void psc_serial_setbrg (void)
+void serial_setbrg (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        volatile psc8220_t *psc = (psc8220_t *) PSC_BASE;
        u32 counter;