Commit a15da8ef authored by Grant Likely's avatar Grant Likely Committed by Josh Boyer

[POWERPC] Uartlite: Fix reg io to access documented register size

The Uartlite data sheet defines the registers as 32 bit wide.  This
patch changes the register access to use 32 bit transfers and eliminates
the magic +3 offset which is currently required to make the device
work.
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarJohn Williams <jwilliams@itee.uq.edu.au>
Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent 260c02a9
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
.num_resources = 2, \ .num_resources = 2, \
.resource = (struct resource[]) { \ .resource = (struct resource[]) { \
{ \ { \
.start = XPAR_UARTLITE_##num##_BASEADDR + 3, \ .start = XPAR_UARTLITE_##num##_BASEADDR, \
.end = XPAR_UARTLITE_##num##_HIGHADDR, \ .end = XPAR_UARTLITE_##num##_HIGHADDR, \
.flags = IORESOURCE_MEM, \ .flags = IORESOURCE_MEM, \
}, \ }, \
......
...@@ -61,7 +61,7 @@ static int ulite_receive(struct uart_port *port, int stat) ...@@ -61,7 +61,7 @@ static int ulite_receive(struct uart_port *port, int stat)
/* stats */ /* stats */
if (stat & ULITE_STATUS_RXVALID) { if (stat & ULITE_STATUS_RXVALID) {
port->icount.rx++; port->icount.rx++;
ch = readb(port->membase + ULITE_RX); ch = in_be32((void*)port->membase + ULITE_RX);
if (stat & ULITE_STATUS_PARITY) if (stat & ULITE_STATUS_PARITY)
port->icount.parity++; port->icount.parity++;
...@@ -106,7 +106,7 @@ static int ulite_transmit(struct uart_port *port, int stat) ...@@ -106,7 +106,7 @@ static int ulite_transmit(struct uart_port *port, int stat)
return 0; return 0;
if (port->x_char) { if (port->x_char) {
writeb(port->x_char, port->membase + ULITE_TX); out_be32((void*)port->membase + ULITE_TX, port->x_char);
port->x_char = 0; port->x_char = 0;
port->icount.tx++; port->icount.tx++;
return 1; return 1;
...@@ -115,7 +115,7 @@ static int ulite_transmit(struct uart_port *port, int stat) ...@@ -115,7 +115,7 @@ static int ulite_transmit(struct uart_port *port, int stat)
if (uart_circ_empty(xmit) || uart_tx_stopped(port)) if (uart_circ_empty(xmit) || uart_tx_stopped(port))
return 0; return 0;
writeb(xmit->buf[xmit->tail], port->membase + ULITE_TX); out_be32((void*)port->membase + ULITE_TX, xmit->buf[xmit->tail]);
xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE-1); xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE-1);
port->icount.tx++; port->icount.tx++;
...@@ -132,7 +132,7 @@ static irqreturn_t ulite_isr(int irq, void *dev_id) ...@@ -132,7 +132,7 @@ static irqreturn_t ulite_isr(int irq, void *dev_id)
int busy; int busy;
do { do {
int stat = readb(port->membase + ULITE_STATUS); int stat = in_be32((void*)port->membase + ULITE_STATUS);
busy = ulite_receive(port, stat); busy = ulite_receive(port, stat);
busy |= ulite_transmit(port, stat); busy |= ulite_transmit(port, stat);
} while (busy); } while (busy);
...@@ -148,7 +148,7 @@ static unsigned int ulite_tx_empty(struct uart_port *port) ...@@ -148,7 +148,7 @@ static unsigned int ulite_tx_empty(struct uart_port *port)
unsigned int ret; unsigned int ret;
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
ret = readb(port->membase + ULITE_STATUS); ret = in_be32((void*)port->membase + ULITE_STATUS);
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
return ret & ULITE_STATUS_TXEMPTY ? TIOCSER_TEMT : 0; return ret & ULITE_STATUS_TXEMPTY ? TIOCSER_TEMT : 0;
...@@ -171,7 +171,7 @@ static void ulite_stop_tx(struct uart_port *port) ...@@ -171,7 +171,7 @@ static void ulite_stop_tx(struct uart_port *port)
static void ulite_start_tx(struct uart_port *port) static void ulite_start_tx(struct uart_port *port)
{ {
ulite_transmit(port, readb(port->membase + ULITE_STATUS)); ulite_transmit(port, in_be32((void*)port->membase + ULITE_STATUS));
} }
static void ulite_stop_rx(struct uart_port *port) static void ulite_stop_rx(struct uart_port *port)
...@@ -200,17 +200,17 @@ static int ulite_startup(struct uart_port *port) ...@@ -200,17 +200,17 @@ static int ulite_startup(struct uart_port *port)
if (ret) if (ret)
return ret; return ret;
writeb(ULITE_CONTROL_RST_RX | ULITE_CONTROL_RST_TX, out_be32((void*)port->membase + ULITE_CONTROL,
port->membase + ULITE_CONTROL); ULITE_CONTROL_RST_RX | ULITE_CONTROL_RST_TX);
writeb(ULITE_CONTROL_IE, port->membase + ULITE_CONTROL); out_be32((void*)port->membase + ULITE_CONTROL, ULITE_CONTROL_IE);
return 0; return 0;
} }
static void ulite_shutdown(struct uart_port *port) static void ulite_shutdown(struct uart_port *port)
{ {
writeb(0, port->membase + ULITE_CONTROL); out_be32((void*)port->membase + ULITE_CONTROL, 0);
readb(port->membase + ULITE_CONTROL); /* dummy */ in_be32((void*)port->membase + ULITE_CONTROL); /* dummy */
free_irq(port->irq, port); free_irq(port->irq, port);
} }
...@@ -314,7 +314,7 @@ static void ulite_console_wait_tx(struct uart_port *port) ...@@ -314,7 +314,7 @@ static void ulite_console_wait_tx(struct uart_port *port)
/* wait up to 10ms for the character(s) to be sent */ /* wait up to 10ms for the character(s) to be sent */
for (i = 0; i < 10000; i++) { for (i = 0; i < 10000; i++) {
if (readb(port->membase + ULITE_STATUS) & ULITE_STATUS_TXEMPTY) if (in_be32((void*)port->membase + ULITE_STATUS) & ULITE_STATUS_TXEMPTY)
break; break;
udelay(1); udelay(1);
} }
...@@ -323,7 +323,7 @@ static void ulite_console_wait_tx(struct uart_port *port) ...@@ -323,7 +323,7 @@ static void ulite_console_wait_tx(struct uart_port *port)
static void ulite_console_putchar(struct uart_port *port, int ch) static void ulite_console_putchar(struct uart_port *port, int ch)
{ {
ulite_console_wait_tx(port); ulite_console_wait_tx(port);
writeb(ch, port->membase + ULITE_TX); out_be32((void*)port->membase + ULITE_TX, ch);
} }
static void ulite_console_write(struct console *co, const char *s, static void ulite_console_write(struct console *co, const char *s,
...@@ -340,8 +340,8 @@ static void ulite_console_write(struct console *co, const char *s, ...@@ -340,8 +340,8 @@ static void ulite_console_write(struct console *co, const char *s,
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
/* save and disable interrupt */ /* save and disable interrupt */
ier = readb(port->membase + ULITE_STATUS) & ULITE_STATUS_IE; ier = in_be32((void*)port->membase + ULITE_STATUS) & ULITE_STATUS_IE;
writeb(0, port->membase + ULITE_CONTROL); out_be32((void*)port->membase + ULITE_CONTROL, 0);
uart_console_write(port, s, count, ulite_console_putchar); uart_console_write(port, s, count, ulite_console_putchar);
...@@ -349,7 +349,7 @@ static void ulite_console_write(struct console *co, const char *s, ...@@ -349,7 +349,7 @@ static void ulite_console_write(struct console *co, const char *s,
/* restore interrupt state */ /* restore interrupt state */
if (ier) if (ier)
writeb(ULITE_CONTROL_IE, port->membase + ULITE_CONTROL); out_be32((void*)port->membase + ULITE_CONTROL, ULITE_CONTROL_IE);
if (locked) if (locked)
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment