From 367057f26fb24ecb0a60afb145eeb088d66351c4 Mon Sep 17 00:00:00 2001
From: Yi Zhang <yizhang@marvell.com>
Date: Wed, 23 Jan 2013 09:52:25 +0800
Subject: [PATCH] --- yaml --- r: 354836 b: refs/heads/master c:
 9429ccbf386c9fce9d998a96474a0926391208cf h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/tty/serial/pxa.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ab65fafda327..058994b2bfb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8c5b56fdca7bb3006914f0bf7d09b4d64254172
+refs/heads/master: 9429ccbf386c9fce9d998a96474a0926391208cf
diff --git a/trunk/drivers/tty/serial/pxa.c b/trunk/drivers/tty/serial/pxa.c
index a67f9e156ada..05f504e0c271 100644
--- a/trunk/drivers/tty/serial/pxa.c
+++ b/trunk/drivers/tty/serial/pxa.c
@@ -672,7 +672,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
 	unsigned long flags;
 	int locked = 1;
 
-
+	clk_enable(up->clk);
 	local_irq_save(flags);
 	if (up->port.sysrq)
 		locked = 0;
@@ -699,6 +699,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
 	if (locked)
 		spin_unlock(&up->port.lock);
 	local_irq_restore(flags);
+	clk_disable(up->clk);
 
 }
 
@@ -896,6 +897,12 @@ static int serial_pxa_probe(struct platform_device *dev)
 		goto err_free;
 	}
 
+	ret = clk_prepare(sport->clk);
+	if (ret) {
+		clk_put(sport->clk);
+		goto err_free;
+	}
+
 	sport->port.type = PORT_PXA;
 	sport->port.iotype = UPIO_MEM;
 	sport->port.mapbase = mmres->start;
@@ -927,6 +934,7 @@ static int serial_pxa_probe(struct platform_device *dev)
 	return 0;
 
  err_clk:
+	clk_unprepare(sport->clk);
 	clk_put(sport->clk);
  err_free:
 	kfree(sport);
@@ -940,6 +948,8 @@ static int serial_pxa_remove(struct platform_device *dev)
 	platform_set_drvdata(dev, NULL);
 
 	uart_remove_one_port(&serial_pxa_reg, &sport->port);
+
+	clk_unprepare(sport->clk);
 	clk_put(sport->clk);
 	kfree(sport);