From: Heikki Krogerus <heikki.kroge...@linux.intel.com> Instead of assigning the dma member in dw8250_probe_of and dw8250_probe_acpi separately, assigning it in dw8250_probe.
Signed-off-by: Heikki Krogerus <heikki.kroge...@linux.intel.com> Reviewed-by: Andy Shevchenko <andriy.shevche...@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> (cherry picked from commit 2559318caa76028edc9c0553932a17139e6adc58) Signed-off-by: Tan Jui Nee <jui.nee....@intel.com> --- drivers/tty/serial/8250/8250_dw.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index 2611ee6..a606408 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -298,14 +298,6 @@ static int dw8250_probe_of(struct uart_port *p, if (has_ucv) dw8250_setup_port(up); - /* if we have a valid fifosize, try hooking up DMA here */ - if (p->fifosize) { - up->dma = &data->dma; - - up->dma->rxconf.src_maxburst = p->fifosize / 4; - up->dma->txconf.dst_maxburst = p->fifosize / 4; - } - /* get index of serial line, if found in DT aliases */ id = of_alias_get_id(np, "serial"); if (id >= 0) @@ -344,10 +336,6 @@ static int dw8250_probe_acpi(struct uart_8250_port *up, data->dma.fn = dw8250_idma_filter; } - up->dma = &data->dma; - up->dma->rxconf.src_maxburst = p->fifosize / 4; - up->dma->txconf.dst_maxburst = p->fifosize / 4; - up->port.set_termios = dw8250_set_termios; return 0; @@ -494,6 +482,13 @@ static int dw8250_probe(struct platform_device *pdev) goto err_reset; } + /* If we have a valid fifosize, try hooking up DMA */ + if (p->fifosize) { + data->dma.rxconf.src_maxburst = p->fifosize / 4; + data->dma.txconf.dst_maxburst = p->fifosize / 4; + uart.dma = &data->dma; + } + data->line = serial8250_register_8250_port(&uart); if (data->line < 0) { err = data->line; -- 1.9.1 -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto