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

[platform/kernel/u-boot.git] / drivers / serial / serial_sh.c

diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index e47ec2e..bfdb2ce 100644 (file)
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -18,6 +18,7 @@
  */
 
 #include <common.h>
+#include <asm/io.h>
 #include <asm/processor.h>
 
 #if defined(CONFIG_CONS_SCIF0)
@@ -132,17 +133,17 @@ void serial_setbrg(void)
 {
        DECLARE_GLOBAL_DATA_PTR;
 
-       *SCBRR = SCBRR_VALUE(gd->baudrate, CONFIG_SYS_CLK_FREQ);
+       writeb(SCBRR_VALUE(gd->baudrate, CONFIG_SYS_CLK_FREQ), SCBRR);
 }
 
 int serial_init(void)
 {
-       *SCSCR = (SCR_RE | SCR_TE);
-       *SCSMR = 0;
-       *SCSMR = 0;
-       *SCFCR = (FCR_RFRST | FCR_TFRST);
-       *SCFCR;
-       *SCFCR = 0;
+       writew((SCR_RE | SCR_TE), SCSCR);
+       writew(0, SCSMR);
+       writew(0, SCSMR);
+       writew((FCR_RFRST | FCR_TFRST), SCFCR);
+       readw(SCFCR);
+       writew(0, SCFCR);
 
        serial_setbrg();
        return 0;
@@ -151,9 +152,9 @@ int serial_init(void)
 static int serial_rx_fifo_level(void)
 {
 #if defined(SCRFDR)
-       return (*SCRFDR >> 0) & FIFOLEVEL_MASK;
+       return (readw(SCRFDR) >> 0) & FIFOLEVEL_MASK;
 #else
-       return (*SCFDR >> 0) & FIFOLEVEL_MASK;
+       return (readw(SCFDR) >> 0) & FIFOLEVEL_MASK;
 #endif
 }
 
@@ -162,15 +163,15 @@ void serial_raw_putc(const char c)
        unsigned int fsr_bits_to_clear;
 
        while (1) {
-               if (*SCFSR & FSR_TEND) {        /* Tx fifo is empty */
+               if (readw(SCFSR) & FSR_TEND) { /* Tx fifo is empty */
                        fsr_bits_to_clear = FSR_TEND;
                        break;
                }
        }
 
-       *SCFTDR = c;
+       writeb(c, SCFTDR);
        if (fsr_bits_to_clear != 0)
-               *SCFSR &= ~fsr_bits_to_clear;
+               writew(readw(SCFSR) & ~fsr_bits_to_clear, SCFSR);
 }
 
 void serial_putc(const char c)
@@ -196,22 +197,21 @@ int serial_tstc(void)
 #define RDRF_CLEAR             0x00fc
 void handle_error(void)
 {
-
-       (void)*SCFSR;
-       *SCFSR = FSR_ERR_CLEAR;
-       (void)*SCLSR;
-       *SCLSR = 0x00;
+       readw(SCFSR);
+       writew(FSR_ERR_CLEAR, SCFSR);
+       readw(SCLSR);
+       writew(0x00, SCLSR);
 }
 
 int serial_getc_check(void)
 {
        unsigned short status;
 
-       status = *SCFSR;
+       status = readw(SCFSR);
 
        if (status & (FSR_FER | FSR_ER | FSR_BRK))
                handle_error();
-       if (*SCLSR & LSR_ORER)
+       if (readw(SCLSR) & LSR_ORER)
                handle_error();
        return status & (FSR_DR | FSR_RDF);
 }
@@ -224,15 +224,15 @@ int serial_getc(void)
        while (!serial_getc_check())
                ;
 
-       ch = *SCFRDR;
-       status = *SCFSR;
+       ch = readb(SCFRDR);
+       status = readw(SCFSR);
 
-       *SCFSR = RDRF_CLEAR;
+       writew(RDRF_CLEAR, SCFSR);
 
        if (status & (FSR_FER | FSR_FER | FSR_ER | FSR_BRK))
                handle_error();
 
-       if (*SCLSR & LSR_ORER)
+       if (readw(SCLSR) & LSR_ORER)
                handle_error();
 
        return ch;