diff options
| author | Paul Mundt | 2008-10-02 12:14:11 +0200 |
|---|---|---|
| committer | Paul Mundt | 2008-10-02 12:14:11 +0200 |
| commit | bc0f424faa11a2017ba725bb8c5fc481ece7b440 (patch) | |
| tree | e6272f37806941443f1ead19f965e8eeb531282c /drivers/serial/sh-sci.h | |
| parent | serial: sh-sci: Dynamic clock management depends on HAVE_CLK. (diff) | |
| parent | video: sh_mobile_lcdcfb: Support HAVE_CLK=n configurations. (diff) | |
| download | kernel-qcow2-linux-bc0f424faa11a2017ba725bb8c5fc481ece7b440.tar.gz kernel-qcow2-linux-bc0f424faa11a2017ba725bb8c5fc481ece7b440.tar.xz kernel-qcow2-linux-bc0f424faa11a2017ba725bb8c5fc481ece7b440.zip | |
Merge branch 'sh/g3-prep'
Diffstat (limited to 'drivers/serial/sh-sci.h')
| -rw-r--r-- | drivers/serial/sh-sci.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index b3d906bfbd87..511c10d42187 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h @@ -320,18 +320,16 @@ #define SCI_EVENT_WRITE_WAKEUP 0 #define SCI_IN(size, offset) \ - unsigned int addr = port->mapbase + (offset); \ if ((size) == 8) { \ - return ctrl_inb(addr); \ + return ioread8(port->membase + (offset)); \ } else { \ - return ctrl_inw(addr); \ + return ioread16(port->membase + (offset)); \ } #define SCI_OUT(size, offset, value) \ - unsigned int addr = port->mapbase + (offset); \ if ((size) == 8) { \ - ctrl_outb(value, addr); \ + iowrite8(value, port->membase + (offset)); \ } else if ((size) == 16) { \ - ctrl_outw(value, addr); \ + iowrite16(value, port->membase + (offset)); \ } #define CPU_SCIx_FNS(name, sci_offset, sci_size, scif_offset, scif_size)\ |