Commit 0c375501 authored by Huang Shijie's avatar Huang Shijie Committed by Greg Kroah-Hartman
Browse files

serial: imx: enable the clocks for console



The console's clocks are disabled after the uart driver is probed.
It makes that we can see less log from the console now
(though we still can get all the log by the `dmesg`).

So enable the clocks for console, and we can see all the log again.

This patch also disables the sport->clk_per when we fail to enable
the sport->clk_ipg;

Signed-off-by: default avatarHuang Shijie <b32955@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c9e2e946
Loading
Loading
Loading
Loading
+14 −9
Original line number Diff line number Diff line
@@ -702,13 +702,16 @@ static int imx_startup(struct uart_port *port)
	int retval;
	unsigned long flags, temp;

	if (!uart_console(port)) {
		retval = clk_prepare_enable(sport->clk_per);
		if (retval)
			goto error_out1;

		retval = clk_prepare_enable(sport->clk_ipg);
	if (retval)
		if (retval) {
			clk_disable_unprepare(sport->clk_per);
			goto error_out1;
		}
	}

	imx_setup_ufcr(sport, 0);

@@ -1578,8 +1581,10 @@ static int serial_imx_probe(struct platform_device *pdev)
		goto deinit;
	platform_set_drvdata(pdev, sport);

	if (!uart_console(&sport->port)) {
		clk_disable_unprepare(sport->clk_per);
		clk_disable_unprepare(sport->clk_ipg);
	}

	return 0;
deinit: