Commit 388faf9f authored by Qipan Li's avatar Qipan Li Committed by Greg Kroah-Hartman

serial: sirf: provide pm entries of uart_ops

this patch provides PM entry of uart_ops, then drop clk enable and
disable because serial core will do it.

the patch also fixes the issue that uart hang in resume caused by
not-enabled clock.
Signed-off-by: default avatarQipan Li <Qipan.Li@csr.com>
Signed-off-by: default avatarBarry Song <Baohua.Song@csr.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 99e626f5
...@@ -1033,6 +1033,16 @@ static void sirfsoc_uart_set_termios(struct uart_port *port, ...@@ -1033,6 +1033,16 @@ static void sirfsoc_uart_set_termios(struct uart_port *port,
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
} }
static void sirfsoc_uart_pm(struct uart_port *port, unsigned int state,
unsigned int oldstate)
{
struct sirfsoc_uart_port *sirfport = to_sirfport(port);
if (!state)
clk_prepare_enable(sirfport->clk);
else
clk_disable_unprepare(sirfport->clk);
}
static unsigned int sirfsoc_uart_init_tx_dma(struct uart_port *port) static unsigned int sirfsoc_uart_init_tx_dma(struct uart_port *port)
{ {
struct sirfsoc_uart_port *sirfport = to_sirfport(port); struct sirfsoc_uart_port *sirfport = to_sirfport(port);
...@@ -1264,6 +1274,7 @@ static struct uart_ops sirfsoc_uart_ops = { ...@@ -1264,6 +1274,7 @@ static struct uart_ops sirfsoc_uart_ops = {
.startup = sirfsoc_uart_startup, .startup = sirfsoc_uart_startup,
.shutdown = sirfsoc_uart_shutdown, .shutdown = sirfsoc_uart_shutdown,
.set_termios = sirfsoc_uart_set_termios, .set_termios = sirfsoc_uart_set_termios,
.pm = sirfsoc_uart_pm,
.type = sirfsoc_uart_type, .type = sirfsoc_uart_type,
.release_port = sirfsoc_uart_release_port, .release_port = sirfsoc_uart_release_port,
.request_port = sirfsoc_uart_request_port, .request_port = sirfsoc_uart_request_port,
...@@ -1486,7 +1497,6 @@ static int sirfsoc_uart_probe(struct platform_device *pdev) ...@@ -1486,7 +1497,6 @@ static int sirfsoc_uart_probe(struct platform_device *pdev)
ret = PTR_ERR(sirfport->clk); ret = PTR_ERR(sirfport->clk);
goto err; goto err;
} }
clk_prepare_enable(sirfport->clk);
port->uartclk = clk_get_rate(sirfport->clk); port->uartclk = clk_get_rate(sirfport->clk);
port->ops = &sirfsoc_uart_ops; port->ops = &sirfsoc_uart_ops;
...@@ -1502,7 +1512,6 @@ static int sirfsoc_uart_probe(struct platform_device *pdev) ...@@ -1502,7 +1512,6 @@ static int sirfsoc_uart_probe(struct platform_device *pdev)
return 0; return 0;
port_err: port_err:
clk_disable_unprepare(sirfport->clk);
clk_put(sirfport->clk); clk_put(sirfport->clk);
err: err:
return ret; return ret;
...@@ -1512,7 +1521,6 @@ static int sirfsoc_uart_remove(struct platform_device *pdev) ...@@ -1512,7 +1521,6 @@ static int sirfsoc_uart_remove(struct platform_device *pdev)
{ {
struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev); struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);
struct uart_port *port = &sirfport->port; struct uart_port *port = &sirfport->port;
clk_disable_unprepare(sirfport->clk);
clk_put(sirfport->clk); clk_put(sirfport->clk);
uart_remove_one_port(&sirfsoc_uart_drv, port); uart_remove_one_port(&sirfsoc_uart_drv, port);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment