Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a61f0c7 authored by Fabio Estevam's avatar Fabio Estevam Committed by Greg Kroah-Hartman
Browse files

serial: imx: Disable irqs before requesting them 



Disable interrupts before requesting them in order to fix a kernel oops
after lauching a kernel via kexec.

Tested on a imx6sl-evk board.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1eacbfb0

drivers/tty/serial/imx.c

+14 −1
Original line number Diff line number Diff line
@@ -1902,7 +1902,7 @@ static int serial_imx_probe(struct platform_device *pdev) 
{

	struct imx_port *sport;

	void __iomem *base;

	int ret = 0;

	int ret = 0, reg;

	struct resource *res;

	int txirq, rxirq, rtsirq;
@@ -1957,6 +1957,19 @@ static int serial_imx_probe(struct platform_device *pdev) 


	sport->port.uartclk = clk_get_rate(sport->clk_per);



	/* For register access, we only need to enable the ipg clock. */

	ret = clk_prepare_enable(sport->clk_ipg);

	if (ret)

		return ret;



	/* Disable interrupts before requesting them */

	reg = readl_relaxed(sport->port.membase + UCR1);

	reg &= ~(UCR1_ADEN | UCR1_TRDYEN | UCR1_IDEN | UCR1_RRDYEN |

		 UCR1_TXMPTYEN | UCR1_RTSDEN);

	writel_relaxed(reg, sport->port.membase + UCR1);



	clk_disable_unprepare(sport->clk_ipg);



	/*

	 * Allocate the IRQ(s) i.MX1 has three interrupts whereas later

	 * chips only have one interrupt.