summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/voltage.h
diff options
context:
space:
mode:
authorKevin Hilman <khilman@ti.com>2011-07-14 11:29:06 -0700
committerKevin Hilman <khilman@ti.com>2011-09-15 12:09:21 -0700
commite32778804930ed3141ffc55242d88e086d71ac24 (patch)
treebc013f2cd1b985fd8026d8a13d9a312ceaf26c19 /arch/arm/mach-omap2/voltage.h
parent7590f608aacba64c42edd5a8d9560264b049f403 (diff)
downloadlinux-e32778804930ed3141ffc55242d88e086d71ac24.tar.bz2
OMAP3+: voltdm: final removal of omap_vdd_info
Remove last remaining member (volt_data) from omap_vdd_info into struct voltagedomain and removal remaining usage and reference to omap_vdd_info. Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/voltage.h')
-rw-r--r--arch/arm/mach-omap2/voltage.h19
1 files changed, 4 insertions, 15 deletions
diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h
index 0bd71a2910ab..962d808346eb 100644
--- a/arch/arm/mach-omap2/voltage.h
+++ b/arch/arm/mach-omap2/voltage.h
@@ -33,8 +33,6 @@ struct powerdomain;
#define OMAP3_VOLTOFFSET 0xff
#define OMAP3_VOLTSETUP2 0xff
-struct omap_vdd_info;
-
/**
* struct omap_vfsm_instance - per-voltage manager FSM register/bitfield
* data
@@ -60,9 +58,10 @@ struct omap_vfsm_instance {
* @write: write a VC/VP register
* @read: read-modify-write a VC/VP register
* @sys_clk: system clock name/frequency, used for various timing calculations
- * @vdd: to be removed
* @scale: function used to scale the voltage of the voltagedomain
* @nominal_volt: current nominal voltage for this voltage domain
+ * @volt_data: voltage table having the distinct voltages supported
+ * by the domain and other associated per voltage data.
*/
struct voltagedomain {
char *name;
@@ -86,9 +85,9 @@ struct voltagedomain {
int (*scale) (struct voltagedomain *voltdm,
unsigned long target_volt);
- u32 nominal_volt;
- struct omap_vdd_info *vdd;
+ u32 nominal_volt;
+ struct omap_volt_data *volt_data;
};
/**
@@ -145,16 +144,6 @@ struct omap_voltdm_pmic {
u8 (*uv_to_vsel) (unsigned long uV);
};
-/**
- * omap_vdd_info - Per Voltage Domain info
- *
- * @volt_data : voltage table having the distinct voltages supported
- * by the domain and other associated per voltage data.
- */
-struct omap_vdd_info {
- struct omap_volt_data *volt_data;
-};
-
void omap_voltage_get_volttable(struct voltagedomain *voltdm,
struct omap_volt_data **volt_data);
struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm,