From: Paul Walmsley <paul@pwsan.com>
Date: Thu, 2 Aug 2007 18:10:14 +0000 (-0600)
Subject: omap2 clock: vlynq_fck is missing clksel divider code
X-Git-Tag: v2.6.23-omap1~255
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a4f77550bcc72e51b3b07dd6e259ee9d4c07cf40;p=linux-2.6-omap-h63xx.git

omap2 clock: vlynq_fck is missing clksel divider code

vlynq_fck is a clksel clock.  But omap2_clk_set_parent() is missing
the code to divide its parent's rate down appropriately when vlynq_fck
is set to use a core_ck parent.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index be2f12b1062..f5ea6798740 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -823,7 +823,7 @@ static u32 omap2_get_src_field(u32 *type_to_addr, u32 reg_offset,
 			if (src_clk == &func_96m_ck)
 				val = 0;
 			else if (src_clk == &core_ck)
-				val = 0x10;
+				val = 0x10;             /* rate needs fixing */
 		}
 		break;
 	case CM_CORE_SEL2:
@@ -934,7 +934,8 @@ static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
 		clk->parent = new_parent;
 
 		/* SRC_RATE_SEL_MASK clocks follow their parents rates.*/
-		if ((new_parent == &core_ck) && (clk == &dss1_fck))
+		if ((new_parent == &core_ck) &&
+		    (clk == &dss1_fck || clk == &vlynq_fck))
 			clk->rate = new_parent->rate / 0x10;
 		else
 			clk->rate = new_parent->rate;