From d39bf0270aaafc2844d36a6c3872f842cf4f23b6 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 5 Feb 2007 16:10:16 -0800 Subject: [PATCH] --- yaml --- r: 48887 b: refs/heads/master c: 8c0b254b7efaa7941b3acfe790dd16597b0964b3 h: refs/heads/master i: 48885: e8401a4a834481fe95f32dc31ed4a3550828705b 48883: f9abdc10ef801b198901e89e92234fb216892a60 48879: 2ef361ee994b4d7d1c6b3c1b9c2a9087973c6b17 v: v3 --- [refs] | 2 +- trunk/drivers/serial/imx.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 53c8cddd22c5..44ad4e8eebf6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae0a846e411dc0b568e8ccda584896310ee5f369 +refs/heads/master: 8c0b254b7efaa7941b3acfe790dd16597b0964b3 diff --git a/trunk/drivers/serial/imx.c b/trunk/drivers/serial/imx.c index e216dcf29376..03b495c2de14 100644 --- a/trunk/drivers/serial/imx.c +++ b/trunk/drivers/serial/imx.c @@ -154,7 +154,7 @@ static inline void imx_transmit_buffer(struct imx_port *sport) { struct circ_buf *xmit = &sport->port.info->xmit; - do { + while (!(UTS((u32)sport->port.membase) & UTS_TXFULL)) { /* send xmit->buf[xmit->tail] * out the port here */ URTX0((u32)sport->port.membase) = xmit->buf[xmit->tail]; @@ -163,7 +163,7 @@ static inline void imx_transmit_buffer(struct imx_port *sport) sport->port.icount.tx++; if (uart_circ_empty(xmit)) break; - } while (!(UTS((u32)sport->port.membase) & UTS_TXFULL)); + } if (uart_circ_empty(xmit)) imx_stop_tx(&sport->port); @@ -178,8 +178,7 @@ static void imx_start_tx(struct uart_port *port) UCR1((u32)sport->port.membase) |= UCR1_TXMPTYEN; - if(UTS((u32)sport->port.membase) & UTS_TXEMPTY) - imx_transmit_buffer(sport); + imx_transmit_buffer(sport); } static irqreturn_t imx_rtsint(int irq, void *dev_id) @@ -678,7 +677,7 @@ static struct imx_port imx_ports[] = { .mapbase = IMX_UART1_BASE, /* FIXME */ .irq = UART1_MINT_RX, .uartclk = 16000000, - .fifosize = 8, + .fifosize = 32, .flags = UPF_BOOT_AUTOCONF, .ops = &imx_pops, .line = 0, @@ -694,7 +693,7 @@ static struct imx_port imx_ports[] = { .mapbase = IMX_UART2_BASE, /* FIXME */ .irq = UART2_MINT_RX, .uartclk = 16000000, - .fifosize = 8, + .fifosize = 32, .flags = UPF_BOOT_AUTOCONF, .ops = &imx_pops, .line = 1,