From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 27 Jul 2015 18:12:39 +0000 (-0700)
Subject: Merge 4.2-rc4 into tty-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=92311e46ecf2298d87f175c8449ab4d8c400a38e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge 4.2-rc4 into tty-next

Other serial driver work wants to build on patches now in 4.2-rc4 so
merge the branch so this can properly happen.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

92311e46ecf2298d87f175c8449ab4d8c400a38e
diff --cc drivers/tty/serial/imx.c
index 83b02d494723,54fdc7866ea1..e705149ba477
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@@ -1139,14 -1121,16 +1139,9 @@@ static int imx_startup(struct uart_por
  
  	writel(temp & ~UCR4_DREN, sport->port.membase + UCR4);
  
- 	/* Can we enable the DMA support? */
- 	if (is_imx6q_uart(sport) && !uart_console(port) &&
- 	    !sport->dma_is_inited)
- 		imx_uart_dma_init(sport);
- 
  	spin_lock_irqsave(&sport->port.lock, flags);
  	/* Reset fifo's and state machines */
 -	i = 100;
 -
 -	temp = readl(sport->port.membase + UCR2);
 -	temp &= ~UCR2_SRST;
 -	writel(temp, sport->port.membase + UCR2);
 -
 -	while (!(readl(sport->port.membase + UCR2) & UCR2_SRST) && (--i > 0))
 -		udelay(1);
 +	imx_reset(sport);
  
  	/*
  	 * Finally, clear and enable interrupts