From: Kevin Hilman <khilman@mvista.com>
Date: Tue, 11 Dec 2007 17:02:54 +0000 (-0800)
Subject: ARM: OMAP3: update clk_wait_ready() for OMAP3 DSS clocks
X-Git-Tag: v2.6.24-omap1~92
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=de34db321a0c4630702b26db1b949b1be4dc790e

ARM: OMAP3: update clk_wait_ready() for OMAP3 DSS clocks

Signed-off-by: Kevin Hilman <khilman@mvista.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 668560dba55..f863ab5b454 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -43,6 +43,7 @@
 #include "prm_regbits_24xx.h"
 #include "cm.h"
 #include "cm_regbits_24xx.h"
+#include "cm_regbits_34xx.h"
 
 #define MAX_CLOCK_ENABLE_WAIT		100000
 
@@ -220,6 +221,12 @@ static void omap2_clk_wait_ready(struct clk *clk)
 			return;
 	}
 
+	/* REVISIT: What are the appropriate exclusions for 34XX? */
+	/* OMAP3: ignore DSS-mod clocks */
+	if (cpu_is_omap34xx() &&
+	    (((u32)reg & ~0xff) == (u32)OMAP_CM_REGADDR(OMAP3430_DSS_MOD, 0)))
+		return;
+
 	/* Check if both functional and interface clocks
 	 * are running. */
 	bit = 1 << clk->enable_bit;