summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-09-13 18:51:55 +0100
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2022-05-23 16:02:21 +0100
commit4523046a2389c6ee03f4b468a41cb5e5024b617c (patch)
tree03d9b5d4b9bb98d172e5c953ba0ba9e4aaa69f33 /drivers
parent185844cfa72f5ec1395be77528ca4003f2cbb21a (diff)
add sa11x0 uart clocks
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/sa1100.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/tty/serial/sa1100.c b/drivers/tty/serial/sa1100.c
index 3aba89ab4796..48dfefdb5568 100644
--- a/drivers/tty/serial/sa1100.c
+++ b/drivers/tty/serial/sa1100.c
@@ -8,6 +8,7 @@
*/
#include <linux/module.h>
+#include <linux/clk.h>
#include <linux/gpio/consumer.h>
#include <linux/ioport.h>
#include <linux/init.h>
@@ -76,6 +77,7 @@ struct sa1100_port {
struct uart_port port;
struct timer_list timer;
unsigned int old_status;
+ struct clk *clk;
struct mctrl_gpios *gpios;
struct gpio_desc *xcvr_enable;
unsigned wake;
@@ -365,13 +367,19 @@ static int sa1100_startup(struct uart_port *port)
container_of(port, struct sa1100_port, port);
int retval;
+ retval = clk_prepare_enable(sport->clk);
+ if (retval)
+ return retval;
+
/*
* Allocate the IRQ
*/
retval = request_irq(sport->port.irq, sa1100_int, 0,
"sa11x0-uart", sport);
- if (retval)
+ if (retval) {
+ clk_disable_unprepare(sport->clk);
return retval;
+ }
/*
* Finally, clear and enable interrupts
@@ -408,6 +416,8 @@ static void sa1100_shutdown(struct uart_port *port)
* Disable all interrupts, port and break condition.
*/
UART_PUT_UTCR3(sport, 0);
+
+ clk_disable_unprepare(sport->clk);
}
static void
@@ -963,6 +973,10 @@ static int sa1100_serial_add_one_port(struct sa1100_port *sport, struct platform
sport->xcvr_enable = NULL;
}
+ sport->clk = devm_clk_get(sport->port.dev, NULL);
+ if (IS_ERR(sport->clk))
+ return PTR_ERR(sport->clk);
+
device_init_wakeup(sport->port.dev, !!sport->wake);
platform_set_drvdata(dev, sport);