From 467a1130d268938c5f80943cbc289871864d91cb Mon Sep 17 00:00:00 2001 From: Markus Pietrek Date: Fri, 15 Jan 2010 08:33:20 +0900 Subject: [PATCH] --- yaml --- r: 179293 b: refs/heads/master c: 75136d48e85915fd78a072f22897622b5d4c1814 h: refs/heads/master i: 179291: bbbbf8b2e89659c29656f52ba6fd0d0eb40c173e v: v3 --- [refs] | 2 +- trunk/drivers/serial/sh-sci.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 796863d7a883..973ec38c5c02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea4407834118405ef419e9b07794ceacadc01bae +refs/heads/master: 75136d48e85915fd78a072f22897622b5d4c1814 diff --git a/trunk/drivers/serial/sh-sci.c b/trunk/drivers/serial/sh-sci.c index 37f0de9dd9ce..42f3333c4ad0 100644 --- a/trunk/drivers/serial/sh-sci.c +++ b/trunk/drivers/serial/sh-sci.c @@ -1052,7 +1052,18 @@ static void __devinit sci_init_single(struct platform_device *dev, sci_port->port.ops = &sci_uart_ops; sci_port->port.iotype = UPIO_MEM; sci_port->port.line = index; - sci_port->port.fifosize = 1; + + switch (p->type) { + case PORT_SCIFA: + sci_port->port.fifosize = 64; + break; + case PORT_SCIF: + sci_port->port.fifosize = 16; + break; + default: + sci_port->port.fifosize = 1; + break; + } if (dev) { sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL;