diff options
author | Kevin Hilman <khilman@ti.com> | 2011-04-04 18:25:07 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2011-09-15 15:09:07 -0400 |
commit | b7ea803e55769768d1eff3b32e4f99837fa6ddb5 (patch) | |
tree | efe5022fab4248d5f5fe33284d91b4743121115d /arch/arm/mach-omap2/vp3xxx_data.c | |
parent | d7b0de2b46803062148345ae6a976c1e44a457b6 (diff) |
OMAP3+: VP: cleanup: move VP instance into voltdm, misc. renames
- move VP instance struct from vdd_info into struct voltage domain
- remove _data suffix from structure name
- rename vp_ prefix from vp_common field: accesses are now vp->common
- move vp_enabled bool from vdd_info into VP instance
- remove remaining references to omap_vdd_info
No functional changes.
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/vp3xxx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/vp3xxx_data.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/vp3xxx_data.c b/arch/arm/mach-omap2/vp3xxx_data.c index b01d33325d52..79c3df94f500 100644 --- a/arch/arm/mach-omap2/vp3xxx_data.c +++ b/arch/arm/mach-omap2/vp3xxx_data.c | |||
@@ -36,7 +36,7 @@ static const struct omap_vp_ops omap3_vp_ops = { | |||
36 | * VP data common to 34xx/36xx chips | 36 | * VP data common to 34xx/36xx chips |
37 | * XXX This stuff presumably belongs in the vp3xxx.c or vp.c file. | 37 | * XXX This stuff presumably belongs in the vp3xxx.c or vp.c file. |
38 | */ | 38 | */ |
39 | static const struct omap_vp_common_data omap3_vp_common = { | 39 | static const struct omap_vp_common omap3_vp_common = { |
40 | .vpconfig_erroroffset_shift = OMAP3430_ERROROFFSET_SHIFT, | 40 | .vpconfig_erroroffset_shift = OMAP3430_ERROROFFSET_SHIFT, |
41 | .vpconfig_errorgain_mask = OMAP3430_ERRORGAIN_MASK, | 41 | .vpconfig_errorgain_mask = OMAP3430_ERRORGAIN_MASK, |
42 | .vpconfig_errorgain_shift = OMAP3430_ERRORGAIN_SHIFT, | 42 | .vpconfig_errorgain_shift = OMAP3430_ERRORGAIN_SHIFT, |
@@ -56,9 +56,9 @@ static const struct omap_vp_common_data omap3_vp_common = { | |||
56 | .ops = &omap3_vp_ops, | 56 | .ops = &omap3_vp_ops, |
57 | }; | 57 | }; |
58 | 58 | ||
59 | struct omap_vp_instance_data omap3_vp1_data = { | 59 | struct omap_vp_instance omap3_vp_mpu = { |
60 | .id = OMAP3_VP_VDD_MPU_ID, | 60 | .id = OMAP3_VP_VDD_MPU_ID, |
61 | .vp_common = &omap3_vp_common, | 61 | .common = &omap3_vp_common, |
62 | .vpconfig = OMAP3_PRM_VP1_CONFIG_OFFSET, | 62 | .vpconfig = OMAP3_PRM_VP1_CONFIG_OFFSET, |
63 | .vstepmin = OMAP3_PRM_VP1_VSTEPMIN_OFFSET, | 63 | .vstepmin = OMAP3_PRM_VP1_VSTEPMIN_OFFSET, |
64 | .vstepmax = OMAP3_PRM_VP1_VSTEPMAX_OFFSET, | 64 | .vstepmax = OMAP3_PRM_VP1_VSTEPMAX_OFFSET, |
@@ -67,9 +67,9 @@ struct omap_vp_instance_data omap3_vp1_data = { | |||
67 | .voltage = OMAP3_PRM_VP1_VOLTAGE_OFFSET, | 67 | .voltage = OMAP3_PRM_VP1_VOLTAGE_OFFSET, |
68 | }; | 68 | }; |
69 | 69 | ||
70 | struct omap_vp_instance_data omap3_vp2_data = { | 70 | struct omap_vp_instance omap3_vp_core = { |
71 | .id = OMAP3_VP_VDD_CORE_ID, | 71 | .id = OMAP3_VP_VDD_CORE_ID, |
72 | .vp_common = &omap3_vp_common, | 72 | .common = &omap3_vp_common, |
73 | .vpconfig = OMAP3_PRM_VP2_CONFIG_OFFSET, | 73 | .vpconfig = OMAP3_PRM_VP2_CONFIG_OFFSET, |
74 | .vstepmin = OMAP3_PRM_VP2_VSTEPMIN_OFFSET, | 74 | .vstepmin = OMAP3_PRM_VP2_VSTEPMIN_OFFSET, |
75 | .vstepmax = OMAP3_PRM_VP2_VSTEPMAX_OFFSET, | 75 | .vstepmax = OMAP3_PRM_VP2_VSTEPMAX_OFFSET, |