Hi everyone,
The previous version of this patch tried to wait for the SSI module
on OMAP3; this is now fixed; also, added some code cleanup.
- Paul
----
On OMAP3430ES2, DSS has both an initiator standby CM_IDLEST bit, and a
target idle CM_IDLEST bit. This is a departure from previous silicon,
which only had an initiator standby bit.
This means we need to test the target idle bit after enabling
dss1_alwon_fclk. Previous clock code has done the wrong thing since ES2
came out: it's either tested the wrong bit, causing
Clock dss1_alwon_fck failed to enable in 100000 tries
messages, or not tested anything at all, causing crashes during DISPC
initialization with:
Unhandled fault: external abort on non-linefetch (0x1028)
This patch modifies omap2_clk_wait_ready() to wait for the DSS to become
accessible after dss1_alwon_fclk, dss_l3_iclk, and dss_l4_iclk are enabled.
It also does some cleanup by getting rid of some casts.
Thanks to:
. Anand Gadiyar <gadiyar@xxxxxx> for identifying one of the problem patches,
. Koen Kooi <k.kooi@xxxxxxxxxxxxxxxxxx> for testing the previous version of
this patch,
. Dirk Behme <dirk.behme@xxxxxxxxxxxxxx> for review of the previous version,
. Igor Stoppa <igor.stoppa@xxxxxxxxx> and Richard Woodruff
<r-woodruff2@xxxxxx> for help with the SSI portion of the patch.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
---
arch/arm/mach-omap2/clock.c | 63 +++++++++++++++++++++++++--------
arch/arm/mach-omap2/cm-regbits-34xx.h | 4 ++
2 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index ed15868..4d76ea5 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -222,20 +222,22 @@ int omap2_wait_clock_ready(void __iomem *reg, u32 mask, const char *name)
*/
static void omap2_clk_wait_ready(struct clk *clk)
{
- u32 bit, reg, other_reg, st_reg;
+ u32 bit;
+ unsigned long reg, other_reg, st_reg, prcm_mod, prcm_regid;
- reg = (__force u32)clk->enable_reg;
- if (((reg & 0xff) >= CM_FCLKEN1) &&
- ((reg & 0xff) <= OMAP24XX_CM_FCLKEN2))
+ reg = (unsigned long)clk->enable_reg;
+ prcm_mod = reg & ~0xff;
+ prcm_regid = reg & 0xff;
+
+ if (prcm_regid >= CM_FCLKEN1 && prcm_regid <= OMAP24XX_CM_FCLKEN2)
other_reg = ((reg & ~0xf0) | 0x10); /* CM_ICLKEN* */
- else if (((reg & 0xff) >= CM_ICLKEN1) &&
- ((reg & 0xff) <= OMAP24XX_CM_ICLKEN4))
+ else if (prcm_regid >= CM_ICLKEN1 && prcm_regid <= OMAP24XX_CM_ICLKEN4)
other_reg = ((reg & ~0xf0) | 0x00); /* CM_FCLKEN* */
else
return;
- /* REVISIT: What are the appropriate exclusions for 34XX? */
- /* No check for DSS or cam clocks */
+ /* No check for DSS or CAM clocks on 24xx */
+ /* REVISIT: This should check prcm_mod against CORE_MOD */
if (cpu_is_omap24xx() && (reg & 0x0f) == 0) { /* CM_{F,I}CLKEN1 */
if (clk->enable_bit == OMAP24XX_EN_DSS2_SHIFT ||
clk->enable_bit == OMAP24XX_EN_DSS1_SHIFT ||
@@ -244,21 +246,50 @@ static void omap2_clk_wait_ready(struct clk *clk)
}
/* REVISIT: What are the appropriate exclusions for 34XX? */
- /* OMAP3: ignore DSS-mod clocks */
- if (cpu_is_omap34xx() &&
- ((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) ||
- (((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(CORE_MOD, 0)) &&
- clk->enable_bit == OMAP3430_EN_SSI_SHIFT)))
- return;
+ if (cpu_is_omap34xx()) {
+
+ /* 3430ES1 DSS has no target idlest bits */
+ if (is_sil_rev_equal_to(OMAP3430_REV_ES1_0) &&
+ (prcm_mod == OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) ||
+ (prcm_mod == OMAP34XX_CM_REGADDR(CORE_MOD, 0) &&
+ clk->enable_bit == OMAP3430_EN_SSI_SHIFT)))
+ return;
+
+ /*
+ * For 3430ES2 DSS, wait once (dss1_alwon_fclk,
+ * dss_l3_iclk, dss_l4_iclk) are enabled
+ */
+ if (is_sil_rev_greater_than(OMAP3430_REV_ES1_0) &&
+ prcm_mod == OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) &&
+ clk->enable_bit != OMAP3430_EN_DSS1_SHIFT)
+ return;
+
+ /* SSI has no target idlest bit on OMAP3 */
+ if (prcm_mod == OMAP34XX_CM_REGADDR(CORE_MOD, 0) &&
+ clk->enable_bit == OMAP3430_EN_SSI_SHIFT)
+ return;
+
+ }
/* Check if both functional and interface clocks
* are running. */
bit = 1 << clk->enable_bit;
- if (!(__raw_readl((__force void __iomem *)other_reg) & bit))
+ if (!(__raw_readl((void __iomem *)other_reg) & bit))
return;
+
+ /*
+ * OMAP3430ES2 DSS target idlest bit is at a different shift than
+ * the corresponding {I,F}CLKEN bits
+ */
+ if (cpu_is_omap34xx() &&
+ prcm_mod == OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) &&
+ clk->enable_bit == OMAP3430_EN_DSS1_SHIFT) {
+ bit = OMAP3430ES2_ST_DSS_IDLE;
+ }
+
st_reg = ((other_reg & ~0xf0) | 0x20); /* CM_IDLEST* */
- omap2_wait_clock_ready((__force void __iomem *)st_reg, bit, clk->name);
+ omap2_wait_clock_ready((void __iomem *)st_reg, bit, clk->name);
}
/* Enables clock without considering parent dependencies or use count
diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h
index 6ec66f4..946c552 100644
--- a/arch/arm/mach-omap2/cm-regbits-34xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-34xx.h
@@ -500,7 +500,9 @@
#define OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT 0
/* CM_IDLEST_DSS */
-#define OMAP3430_ST_DSS (1 << 0)
+#define OMAP3430ES2_ST_DSS_IDLE (1 << 1)
+#define OMAP3430ES2_ST_DSS_STDBY (1 << 0)
+#define OMAP3430ES1_ST_DSS (1 << 0)
/* CM_AUTOIDLE_DSS */
#define OMAP3430_AUTO_DSS (1 << 0)
--
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
