From a7c489ed49f512e5ba2cb0ad18d4b905f698fccc Mon Sep 17 00:00:00 2001 From: Heikki Krogerus Date: Wed, 16 Jan 2013 14:08:16 +0200 Subject: [PATCH] --- yaml --- r: 354800 b: refs/heads/master c: f5836a55dee705d47a16c32139c02721763ff699 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/8250/8250_dw.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4ab21020c3c4..1221610ecc71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 053fac36b1d9f76adde96a2f731965aaab3c632b +refs/heads/master: f5836a55dee705d47a16c32139c02721763ff699 diff --git a/trunk/drivers/tty/serial/8250/8250_dw.c b/trunk/drivers/tty/serial/8250/8250_dw.c index bfdaf8b2680b..117bb8b03598 100644 --- a/trunk/drivers/tty/serial/8250/8250_dw.c +++ b/trunk/drivers/tty/serial/8250/8250_dw.c @@ -178,6 +178,7 @@ dw8250_acpi_walk_resource(struct acpi_resource *res, void *data) slave->direction = DMA_MEM_TO_DEV; slave->dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; slave->slave_id = fixed_dma->request_lines; + slave->dst_maxburst = port->tx_loadsz / 4; dma->tx_chan_id = fixed_dma->channels; dma->tx_param = &dma->tx_chan_id; @@ -189,6 +190,7 @@ dw8250_acpi_walk_resource(struct acpi_resource *res, void *data) slave->direction = DMA_DEV_TO_MEM; slave->src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; slave->slave_id = fixed_dma->request_lines; + slave->src_maxburst = p->fifosize / 4; dma->rx_chan_id = fixed_dma->channels; dma->rx_param = &dma->rx_chan_id; @@ -296,6 +298,8 @@ static int dw8250_probe(struct platform_device *pdev) uart.port.serial_in = dw8250_serial_in; uart.port.serial_out = dw8250_serial_out; + dw8250_setup_port(&uart); + if (pdev->dev.of_node) { err = dw8250_probe_of(&uart.port); if (err) @@ -308,8 +312,6 @@ static int dw8250_probe(struct platform_device *pdev) return -ENODEV; } - dw8250_setup_port(&uart); - data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM;