Commit 5e50d2d6 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt

serial: sh-sci: Runtime PM support

Add support for Runtime PM in the sh-sci driver.
Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 972b1943
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/serial_sci.h> #include <linux/serial_sci.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/pm_runtime.h>
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/ctype.h> #include <linux/ctype.h>
...@@ -562,6 +563,9 @@ static void sci_break_timer(unsigned long data) ...@@ -562,6 +563,9 @@ static void sci_break_timer(unsigned long data)
{ {
struct sci_port *port = (struct sci_port *)data; struct sci_port *port = (struct sci_port *)data;
if (port->enable)
port->enable(&port->port);
if (sci_rxd_in(&port->port) == 0) { if (sci_rxd_in(&port->port) == 0) {
port->break_flag = 1; port->break_flag = 1;
sci_schedule_break_timer(port); sci_schedule_break_timer(port);
...@@ -571,6 +575,9 @@ static void sci_break_timer(unsigned long data) ...@@ -571,6 +575,9 @@ static void sci_break_timer(unsigned long data)
sci_schedule_break_timer(port); sci_schedule_break_timer(port);
} else } else
port->break_flag = 0; port->break_flag = 0;
if (port->disable)
port->disable(&port->port);
} }
static int sci_handle_errors(struct uart_port *port) static int sci_handle_errors(struct uart_port *port)
...@@ -839,6 +846,8 @@ static void sci_clk_enable(struct uart_port *port) ...@@ -839,6 +846,8 @@ static void sci_clk_enable(struct uart_port *port)
{ {
struct sci_port *sci_port = to_sci_port(port); struct sci_port *sci_port = to_sci_port(port);
pm_runtime_get_sync(port->dev);
clk_enable(sci_port->iclk); clk_enable(sci_port->iclk);
sci_port->port.uartclk = clk_get_rate(sci_port->iclk); sci_port->port.uartclk = clk_get_rate(sci_port->iclk);
clk_enable(sci_port->fclk); clk_enable(sci_port->fclk);
...@@ -850,6 +859,8 @@ static void sci_clk_disable(struct uart_port *port) ...@@ -850,6 +859,8 @@ static void sci_clk_disable(struct uart_port *port)
clk_disable(sci_port->fclk); clk_disable(sci_port->fclk);
clk_disable(sci_port->iclk); clk_disable(sci_port->iclk);
pm_runtime_put_sync(port->dev);
} }
static int sci_request_irq(struct sci_port *port) static int sci_request_irq(struct sci_port *port)
...@@ -1758,6 +1769,8 @@ static int __devinit sci_init_single(struct platform_device *dev, ...@@ -1758,6 +1769,8 @@ static int __devinit sci_init_single(struct platform_device *dev,
sci_port->enable = sci_clk_enable; sci_port->enable = sci_clk_enable;
sci_port->disable = sci_clk_disable; sci_port->disable = sci_clk_disable;
port->dev = &dev->dev; port->dev = &dev->dev;
pm_runtime_enable(&dev->dev);
} }
sci_port->break_timer.data = (unsigned long)sci_port; sci_port->break_timer.data = (unsigned long)sci_port;
...@@ -1938,6 +1951,7 @@ static int sci_remove(struct platform_device *dev) ...@@ -1938,6 +1951,7 @@ static int sci_remove(struct platform_device *dev)
clk_put(port->iclk); clk_put(port->iclk);
clk_put(port->fclk); clk_put(port->fclk);
pm_runtime_disable(&dev->dev);
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