diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-06 17:06:37 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-06 17:06:37 -0800 |
| commit | 46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91 (patch) | |
| tree | d44b14736a46cd0d4270460fd6590a6d07c40730 /arch/arm/mach-omap2/vc.h | |
| parent | b197adabbd2f71c966b4bd89cca5a54a2def03e2 (diff) | |
| parent | df7cded30ced539d3b4e6bae9f3011d98c069d41 (diff) | |
| download | olio-linux-3.10-46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91.tar.xz olio-linux-3.10-46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91.zip | |
Merge tag 'for_3.8-pm-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.8/pm
OMAP voltage layer updates towards supporting auto-retention/auto-off
Diffstat (limited to 'arch/arm/mach-omap2/vc.h')
| -rw-r--r-- | arch/arm/mach-omap2/vc.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/vc.h b/arch/arm/mach-omap2/vc.h index 478bf6b432c..91c8d75bf2e 100644 --- a/arch/arm/mach-omap2/vc.h +++ b/arch/arm/mach-omap2/vc.h @@ -86,7 +86,6 @@ struct omap_vc_channel { u16 i2c_slave_addr; u16 volt_reg_addr; u16 cmd_reg_addr; - u16 setup_time; u8 cfg_channel; bool i2c_high_speed; @@ -111,6 +110,13 @@ extern struct omap_vc_channel omap4_vc_mpu; extern struct omap_vc_channel omap4_vc_iva; extern struct omap_vc_channel omap4_vc_core; +extern struct omap_vc_param omap3_mpu_vc_data; +extern struct omap_vc_param omap3_core_vc_data; + +extern struct omap_vc_param omap4_mpu_vc_data; +extern struct omap_vc_param omap4_iva_vc_data; +extern struct omap_vc_param omap4_core_vc_data; + void omap_vc_init_channel(struct voltagedomain *voltdm); int omap_vc_pre_scale(struct voltagedomain *voltdm, unsigned long target_volt, |