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/vp.h | |
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/vp.h')
-rw-r--r-- | arch/arm/mach-omap2/vp.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/vp.h b/arch/arm/mach-omap2/vp.h index 382fef13dbc..b50ca91fef2 100644 --- a/arch/arm/mach-omap2/vp.h +++ b/arch/arm/mach-omap2/vp.h | |||
@@ -45,7 +45,7 @@ struct omap_vp_ops { | |||
45 | }; | 45 | }; |
46 | 46 | ||
47 | /** | 47 | /** |
48 | * struct omap_vp_common_data - register data common to all VDDs | 48 | * struct omap_vp_common - register data common to all VDDs |
49 | * @vpconfig_errorgain_mask: ERRORGAIN bitmask in the PRM_VP*_CONFIG reg | 49 | * @vpconfig_errorgain_mask: ERRORGAIN bitmask in the PRM_VP*_CONFIG reg |
50 | * @vpconfig_initvoltage_mask: INITVOLTAGE bitmask in the PRM_VP*_CONFIG reg | 50 | * @vpconfig_initvoltage_mask: INITVOLTAGE bitmask in the PRM_VP*_CONFIG reg |
51 | * @vpconfig_timeouten_mask: TIMEOUT bitmask in the PRM_VP*_CONFIG reg | 51 | * @vpconfig_timeouten_mask: TIMEOUT bitmask in the PRM_VP*_CONFIG reg |
@@ -67,7 +67,7 @@ struct omap_vp_ops { | |||
67 | * bitfield - remove one | 67 | * bitfield - remove one |
68 | * XXX Many of these fields are wrongly named -- e.g., vpconfig_smps* -- fix! | 68 | * XXX Many of these fields are wrongly named -- e.g., vpconfig_smps* -- fix! |
69 | */ | 69 | */ |
70 | struct omap_vp_common_data { | 70 | struct omap_vp_common { |
71 | u32 vpconfig_errorgain_mask; | 71 | u32 vpconfig_errorgain_mask; |
72 | u32 vpconfig_initvoltage_mask; | 72 | u32 vpconfig_initvoltage_mask; |
73 | u32 vpconfig_timeouten; | 73 | u32 vpconfig_timeouten; |
@@ -89,19 +89,20 @@ struct omap_vp_common_data { | |||
89 | }; | 89 | }; |
90 | 90 | ||
91 | /** | 91 | /** |
92 | * struct omap_vp_instance_data - VP register offsets (per-VDD) | 92 | * struct omap_vp_instance - VP register offsets (per-VDD) |
93 | * @vp_common: pointer to struct omap_vp_common_data * for this SoC | 93 | * @common: pointer to struct omap_vp_common * for this SoC |
94 | * @vpconfig: PRM_VP*_CONFIG reg offset from PRM start | 94 | * @vpconfig: PRM_VP*_CONFIG reg offset from PRM start |
95 | * @vstepmin: PRM_VP*_VSTEPMIN reg offset from PRM start | 95 | * @vstepmin: PRM_VP*_VSTEPMIN reg offset from PRM start |
96 | * @vlimitto: PRM_VP*_VLIMITTO reg offset from PRM start | 96 | * @vlimitto: PRM_VP*_VLIMITTO reg offset from PRM start |
97 | * @vstatus: PRM_VP*_VSTATUS reg offset from PRM start | 97 | * @vstatus: PRM_VP*_VSTATUS reg offset from PRM start |
98 | * @voltage: PRM_VP*_VOLTAGE reg offset from PRM start | 98 | * @voltage: PRM_VP*_VOLTAGE reg offset from PRM start |
99 | * @id: Unique identifier for VP instance. | 99 | * @id: Unique identifier for VP instance. |
100 | * @enabled: flag to keep track of whether vp is enabled or not | ||
100 | * | 101 | * |
101 | * XXX vp_common is probably not needed since it is per-SoC | 102 | * XXX vp_common is probably not needed since it is per-SoC |
102 | */ | 103 | */ |
103 | struct omap_vp_instance_data { | 104 | struct omap_vp_instance { |
104 | const struct omap_vp_common_data *vp_common; | 105 | const struct omap_vp_common *common; |
105 | u8 vpconfig; | 106 | u8 vpconfig; |
106 | u8 vstepmin; | 107 | u8 vstepmin; |
107 | u8 vstepmax; | 108 | u8 vstepmax; |
@@ -109,6 +110,7 @@ struct omap_vp_instance_data { | |||
109 | u8 vstatus; | 110 | u8 vstatus; |
110 | u8 voltage; | 111 | u8 voltage; |
111 | u8 id; | 112 | u8 id; |
113 | bool enabled; | ||
112 | }; | 114 | }; |
113 | 115 | ||
114 | /** | 116 | /** |
@@ -140,12 +142,12 @@ struct omap_vp_runtime_data { | |||
140 | u8 vlimitto_vddmax; | 142 | u8 vlimitto_vddmax; |
141 | }; | 143 | }; |
142 | 144 | ||
143 | extern struct omap_vp_instance_data omap3_vp1_data; | 145 | extern struct omap_vp_instance omap3_vp_mpu; |
144 | extern struct omap_vp_instance_data omap3_vp2_data; | 146 | extern struct omap_vp_instance omap3_vp_core; |
145 | 147 | ||
146 | extern struct omap_vp_instance_data omap4_vp_mpu_data; | 148 | extern struct omap_vp_instance omap4_vp_mpu; |
147 | extern struct omap_vp_instance_data omap4_vp_iva_data; | 149 | extern struct omap_vp_instance omap4_vp_iva; |
148 | extern struct omap_vp_instance_data omap4_vp_core_data; | 150 | extern struct omap_vp_instance omap4_vp_core; |
149 | 151 | ||
150 | void omap_vp_init(struct voltagedomain *voltdm); | 152 | void omap_vp_init(struct voltagedomain *voltdm); |
151 | void omap_vp_enable(struct voltagedomain *voltdm); | 153 | void omap_vp_enable(struct voltagedomain *voltdm); |