diff options
-rw-r--r-- | arch/arm/mach-omap2/voltage.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/voltagedomains44xx_data.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h index 697095551bb6..990c440d5c51 100644 --- a/arch/arm/mach-omap2/voltage.h +++ b/arch/arm/mach-omap2/voltage.h | |||
@@ -40,12 +40,14 @@ struct powerdomain; | |||
40 | * data | 40 | * data |
41 | * @voltsetup_mask: SETUP_TIME* bitmask in the PRM_VOLTSETUP* register | 41 | * @voltsetup_mask: SETUP_TIME* bitmask in the PRM_VOLTSETUP* register |
42 | * @voltsetup_reg: register offset of PRM_VOLTSETUP from PRM base | 42 | * @voltsetup_reg: register offset of PRM_VOLTSETUP from PRM base |
43 | * @voltsetup_off_reg: register offset of PRM_VOLTSETUP_OFF from PRM base | ||
43 | * | 44 | * |
44 | * XXX What about VOLTOFFSET/VOLTCTRL? | 45 | * XXX What about VOLTOFFSET/VOLTCTRL? |
45 | */ | 46 | */ |
46 | struct omap_vfsm_instance { | 47 | struct omap_vfsm_instance { |
47 | u32 voltsetup_mask; | 48 | u32 voltsetup_mask; |
48 | u8 voltsetup_reg; | 49 | u8 voltsetup_reg; |
50 | u8 voltsetup_off_reg; | ||
49 | }; | 51 | }; |
50 | 52 | ||
51 | /** | 53 | /** |
diff --git a/arch/arm/mach-omap2/voltagedomains44xx_data.c b/arch/arm/mach-omap2/voltagedomains44xx_data.c index a2d7d9ca2380..7da35a67c988 100644 --- a/arch/arm/mach-omap2/voltagedomains44xx_data.c +++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c | |||
@@ -34,14 +34,17 @@ | |||
34 | 34 | ||
35 | static const struct omap_vfsm_instance omap4_vdd_mpu_vfsm = { | 35 | static const struct omap_vfsm_instance omap4_vdd_mpu_vfsm = { |
36 | .voltsetup_reg = OMAP4_PRM_VOLTSETUP_MPU_RET_SLEEP_OFFSET, | 36 | .voltsetup_reg = OMAP4_PRM_VOLTSETUP_MPU_RET_SLEEP_OFFSET, |
37 | .voltsetup_off_reg = OMAP4_PRM_VOLTSETUP_MPU_OFF_OFFSET, | ||
37 | }; | 38 | }; |
38 | 39 | ||
39 | static const struct omap_vfsm_instance omap4_vdd_iva_vfsm = { | 40 | static const struct omap_vfsm_instance omap4_vdd_iva_vfsm = { |
40 | .voltsetup_reg = OMAP4_PRM_VOLTSETUP_IVA_RET_SLEEP_OFFSET, | 41 | .voltsetup_reg = OMAP4_PRM_VOLTSETUP_IVA_RET_SLEEP_OFFSET, |
42 | .voltsetup_off_reg = OMAP4_PRM_VOLTSETUP_IVA_OFF_OFFSET, | ||
41 | }; | 43 | }; |
42 | 44 | ||
43 | static const struct omap_vfsm_instance omap4_vdd_core_vfsm = { | 45 | static const struct omap_vfsm_instance omap4_vdd_core_vfsm = { |
44 | .voltsetup_reg = OMAP4_PRM_VOLTSETUP_CORE_RET_SLEEP_OFFSET, | 46 | .voltsetup_reg = OMAP4_PRM_VOLTSETUP_CORE_RET_SLEEP_OFFSET, |
47 | .voltsetup_off_reg = OMAP4_PRM_VOLTSETUP_CORE_OFF_OFFSET, | ||
45 | }; | 48 | }; |
46 | 49 | ||
47 | static struct voltagedomain omap4_voltdm_mpu = { | 50 | static struct voltagedomain omap4_voltdm_mpu = { |