* Tony Lindgren <tony@xxxxxxxxxxx> [140410 16:52]:
> @@ -220,8 +220,18 @@ static inline u32 omap_usec_to_32k(u32 usec)
> return DIV_ROUND_UP_ULL(32768ULL * (u64)usec, 1000000ULL);
> }
>
> +struct omap3_vc_config {
> + u32 clksetup;
> + u32 voltsetup1;
> + u32 voltsetup2;
> + u32 voltctrl;
> +};
It seems we can keep just voltsetup1 and voltsetup2 here. The
others need to be initialized just once it seems.
> static void omap3_set_off_timings(struct voltagedomain *voltdm)
> {
> + struct omap3_vc_config *c = omap3_vc_timings;
> + u32 tstart, tshut, voltoffset;
> +
> + if (c->clksetup)
> + return;
> +
> + omap_pm_get_oscillator(&tstart, &tshut);
> + if (tstart == ULONG_MAX) {
> + pr_debug("PM: oscillator start-up time not initialized, using 10ms\n");
> + c->clksetup = omap_usec_to_32k(10000);
> + } else {
> + c->clksetup = omap_usec_to_32k(tstart);
> + }
> +
> + /*
> + * For twl4030 errata 27, we need to allow minimum ~488.32 us wait to
> + * switch from HFCLKIN to internal oscillator. That means timings
> + * have voltoffset fixed to 0xa in rounded up 32 KiHz cycles. And
> + * that means we can calculate the value based on the oscillator
> + * start-up time since voltoffset2 = clksetup - voltoffset.
> + */
> + voltoffset = omap_usec_to_32k(488);
> + c->voltsetup2 = c->clksetup - voltoffset;
> + voltdm->write(voltoffset, OMAP3_PRM_VOLTOFFSET_OFFSET);
And here we're missing a write to clksetup, without that the off idle
timings are not correct.. Below is an incremental diff on top of this
patch.
Regards,
Tony
8< -------------------------------
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -221,10 +221,8 @@ static inline u32 omap_usec_to_32k(u32 usec)
}
struct omap3_vc_config {
- u32 clksetup;
u32 voltsetup1;
u32 voltsetup2;
- u32 voltctrl;
};
static struct omap3_vc_config omap3_vc_timings[2];
@@ -368,17 +366,17 @@ static void omap3_set_i2c_timings(struct voltagedomain *voltdm)
static void omap3_set_off_timings(struct voltagedomain *voltdm)
{
struct omap3_vc_config *c = omap3_vc_timings;
- u32 tstart, tshut, voltoffset;
+ u32 tstart, tshut, clksetup, voltoffset;
- if (c->clksetup)
+ if (c->voltsetup2)
return;
omap_pm_get_oscillator(&tstart, &tshut);
if (tstart == ULONG_MAX) {
pr_debug("PM: oscillator start-up time not initialized, using 10ms\n");
- c->clksetup = omap_usec_to_32k(10000);
+ clksetup = omap_usec_to_32k(10000);
} else {
- c->clksetup = omap_usec_to_32k(tstart);
+ clksetup = omap_usec_to_32k(tstart);
}
/*
@@ -389,7 +387,8 @@ static void omap3_set_off_timings(struct voltagedomain *voltdm)
* start-up time since voltoffset2 = clksetup - voltoffset.
*/
voltoffset = omap_usec_to_32k(488);
- c->voltsetup2 = c->clksetup - voltoffset;
+ c->voltsetup2 = clksetup - voltoffset;
+ voltdm->write(clksetup, OMAP3_PRM_CLKSETUP_OFFSET);
voltdm->write(voltoffset, OMAP3_PRM_VOLTOFFSET_OFFSET);
}
--
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
