From: Tony Lindgren <tony@atomide.com>
Date: Thu, 9 Jun 2005 23:27:57 +0000 (-0700)
Subject: ARM: OMAP: Reset unused UART2 48MHz clock
X-Git-Tag: v2.6.13-omap1~122
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=aafb87a4c223f4b7cd0c9b4afa7db7e8c344c6bd;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Reset unused UART2 48MHz clock

CONFIG_OMAP_RESET_CLOCKS would not reset UART2 clock on boards
with just one serial port.
---

diff --git a/arch/arm/mach-omap/clock.c b/arch/arm/mach-omap/clock.c
index cf2da625bf7..c8e8a67a47f 100644
--- a/arch/arm/mach-omap/clock.c
+++ b/arch/arm/mach-omap/clock.c
@@ -386,8 +386,7 @@ static struct clk uart2_ck = {
 	.name		= "uart2_ck",
 	/* Direct from ULPD, no parent */
 	.rate		= 12000000,
-	.flags		= CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | ENABLE_REG_32BIT |
-			  ALWAYS_ENABLED,
+	.flags		= CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | ENABLE_REG_32BIT,
 	.enable_reg	= MOD_CONF_CTRL_0,
 	.enable_bit	= 30,	/* Chooses between 12MHz and 48MHz */
 	.set_rate	= &set_uart_rate,