Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxx>
---
arch/arm/mach-omap2/clock.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 668560d..0051a89 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
@@ -211,7 +212,6 @@ static void omap2_clk_wait_ready(struct clk *clk)
else
return;
- /* REVISIT: What are the appropriate exclusions for 34XX? */
/* No check for DSS or cam clocks */
if (cpu_is_omap24xx() && ((u32)reg & 0x0f) == 0) { /* CM_{F,I}CLKEN1 */
if (clk->enable_bit == OMAP24XX_EN_DSS2_SHIFT ||
@@ -220,6 +220,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;
--
1.5.3.7
-
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
