ENGR00182048: Revert "ENGR00175578 serial/imx..."

This reverts commit a7d9c8864ab801920f6a630767656f6777a95de2.

This commit will break i.mx6dl boot up on SD board and hang at:
Bus freq driver loaded...

Signed-off-by: Jason Liu <r64343@freescale.com>

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 9a6e8b60223d1448d18ac04296d8972e75ea4529..a2a33fb815cae65e3eafb3e5cd1844fc96f2263b 100644 (file)
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -932,8 +932,6 @@ static int imx_startup(struct uart_port *port)
        unsigned long flags, temp;
        struct tty_struct *tty;
 
-       clk_enable(sport->clk);
-
 #ifndef CONFIG_SERIAL_CORE_CONSOLE
        imx_setup_ufcr(sport, 0);
 #endif
@@ -1164,7 +1162,6 @@ static void imx_shutdown(struct uart_port *port)
                writel(temp, sport->port.membase + UCR4);
        }
        spin_unlock_irqrestore(&sport->port.lock, flags);
-       clk_disable(sport->clk);
 }
 
 static void
@@ -1711,7 +1708,6 @@ static int serial_imx_probe(struct platform_device *pdev)
                goto deinit;
        platform_set_drvdata(pdev, &sport->port);
 
-       clk_disable(sport->clk);
        return 0;
 deinit:
        if (pdata && pdata->exit)
@@ -1741,6 +1737,8 @@ static int serial_imx_remove(struct platform_device *pdev)
                clk_put(sport->clk);
        }
 
+       clk_disable(sport->clk);
+
        if (pdata && pdata->exit)
                pdata->exit(pdev);