"Peter 'p2' De Schrijver" <peter.de-schrijver@xxxxxxxxx> writes:
> API definition to set prm setup times.
>
> Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@xxxxxxxxx>
Peter,
I like this approach much better than what we currently have. Pushing
to PM branch.
The next thing I would like to see is all the register value defines
removed from prm-regbits-34xx.h. That header is supposed to be for
the bitfield definitions, not for values.
Kevin
> ---
> arch/arm/mach-omap2/pm.h | 9 +++++++++
> arch/arm/mach-omap2/pm34xx.c | 31 +++++++++++++++++++++++++------
> 2 files changed, 34 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
> index 451f247..d79ea07 100644
> --- a/arch/arm/mach-omap2/pm.h
> +++ b/arch/arm/mach-omap2/pm.h
> @@ -33,9 +33,18 @@ extern void *omap3_secure_ram_storage;
> extern void omap2_block_sleep(void);
> extern void omap2_allow_sleep(void);
> #ifdef CONFIG_ARCH_OMAP3
> +struct prm_setup_times {
> + u16 clksetup;
> + u16 voltsetup_time1;
> + u16 voltsetup_time2;
> + u16 voltoffset;
> + u16 voltsetup2;
> +};
> +
> extern void omap3_pm_off_mode_enable(int);
> extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm);
> extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);
> +extern void omap3_set_prm_setup_times(struct prm_setup_times *setup_times);
> #else
> #define omap3_pm_off_mode_enable(int) do {} while (0);
> #define omap3_pm_get_suspend_state(pwrdm) do {} while (0);
> diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
> index 44189a0..06aa382 100644
> --- a/arch/arm/mach-omap2/pm34xx.c
> +++ b/arch/arm/mach-omap2/pm34xx.c
> @@ -85,6 +85,14 @@ static struct powerdomain *mpu_pwrdm, *neon_pwrdm;
> static struct powerdomain *core_pwrdm, *per_pwrdm;
> static struct powerdomain *cam_pwrdm;
>
> +static struct prm_setup_times prm_setup = {
> + .clksetup = 0xff,
> + .voltsetup_time1 = 0xfff,
> + .voltsetup_time2 = 0xfff,
> + .voltoffset = 0xff,
> + .voltsetup2 = 0xff,
> +};
> +
> static inline void omap3_per_save_context(void)
> {
> omap3_gpio_save_context();
> @@ -880,6 +888,15 @@ int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state)
> return -EINVAL;
> }
>
> +void omap3_set_prm_setup_times(struct prm_setup_times *setup_times)
> +{
> + prm_setup.clksetup = setup_times->clksetup;
> + prm_setup.voltsetup_time1 = setup_times->voltsetup_time1;
> + prm_setup.voltsetup_time2 = setup_times->voltsetup_time2;
> + prm_setup.voltoffset = setup_times->voltoffset;
> + prm_setup.voltsetup2 = setup_times->voltsetup2;
> +}
> +
> static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
> {
> struct power_state *pwrst;
> @@ -1015,6 +1032,7 @@ err2:
>
> static void __init configure_vc(void)
> {
> +
> prm_write_mod_reg((R_SRI2C_SLAVE_ADDR << OMAP3430_SMPS_SA1_SHIFT) |
> (R_SRI2C_SLAVE_ADDR << OMAP3430_SMPS_SA0_SHIFT),
> OMAP3430_GR_MOD, OMAP3_PRM_VC_SMPS_SA_OFFSET);
> @@ -1044,21 +1062,22 @@ static void __init configure_vc(void)
> OMAP3430_GR_MOD,
> OMAP3_PRM_VC_I2C_CFG_OFFSET);
>
> - /* Setup voltctrl and other setup times */
> + /* Setup value for voltctrl */
> prm_write_mod_reg(OMAP3430_AUTO_RET,
> OMAP3430_GR_MOD, OMAP3_PRM_VOLTCTRL_OFFSET);
>
> - prm_write_mod_reg(OMAP3430_CLKSETUP_DURATION, OMAP3430_GR_MOD,
> + /* Write setup times */
> + prm_write_mod_reg(prm_setup.clksetup, OMAP3430_GR_MOD,
> OMAP3_PRM_CLKSETUP_OFFSET);
> - prm_write_mod_reg((OMAP3430_VOLTSETUP_TIME2 <<
> + prm_write_mod_reg((prm_setup.voltsetup_time2 <<
> OMAP3430_SETUP_TIME2_SHIFT) |
> - (OMAP3430_VOLTSETUP_TIME1 <<
> + (prm_setup.voltsetup_time1 <<
> OMAP3430_SETUP_TIME1_SHIFT),
> OMAP3430_GR_MOD, OMAP3_PRM_VOLTSETUP1_OFFSET);
>
> - prm_write_mod_reg(OMAP3430_VOLTOFFSET_DURATION, OMAP3430_GR_MOD,
> + prm_write_mod_reg(prm_setup.voltoffset, OMAP3430_GR_MOD,
> OMAP3_PRM_VOLTOFFSET_OFFSET);
> - prm_write_mod_reg(OMAP3430_VOLTSETUP2_DURATION, OMAP3430_GR_MOD,
> + prm_write_mod_reg(prm_setup.voltsetup2, OMAP3430_GR_MOD,
> OMAP3_PRM_VOLTSETUP2_OFFSET);
> }
>
> --
> 1.5.6.3
>
> --
> 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
--
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
