diff options
author | Tero Kristo <t-kristo@ti.com> | 2012-09-25 12:33:46 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2012-11-05 18:29:17 -0500 |
commit | d3965191a4d28fa6eb875c06e5cfaffa5a8aef29 (patch) | |
tree | 52aa6151d025b1bd84c941421cb11f325c983981 | |
parent | 5a84dc5bc5d7d35d3788f4d1a9c928912c3ad41b (diff) |
ARM: OMAP3+: voltage: remove unused volt_setup_time parameter
This is no longer needed as the ramp times are calculated from
voltage deltas + slew rates.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
-rw-r--r-- | arch/arm/mach-omap2/omap_twl.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-omap2/voltage.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c index 188f21027c9a..ecae9890f0f2 100644 --- a/arch/arm/mach-omap2/omap_twl.c +++ b/arch/arm/mach-omap2/omap_twl.c | |||
@@ -141,7 +141,6 @@ static u8 twl6030_uv_to_vsel(unsigned long uv) | |||
141 | static struct omap_voltdm_pmic omap3_mpu_pmic = { | 141 | static struct omap_voltdm_pmic omap3_mpu_pmic = { |
142 | .slew_rate = 4000, | 142 | .slew_rate = 4000, |
143 | .step_size = 12500, | 143 | .step_size = 12500, |
144 | .volt_setup_time = 0xfff, | ||
145 | .vp_erroroffset = OMAP3_VP_CONFIG_ERROROFFSET, | 144 | .vp_erroroffset = OMAP3_VP_CONFIG_ERROROFFSET, |
146 | .vp_vstepmin = OMAP3_VP_VSTEPMIN_VSTEPMIN, | 145 | .vp_vstepmin = OMAP3_VP_VSTEPMIN_VSTEPMIN, |
147 | .vp_vstepmax = OMAP3_VP_VSTEPMAX_VSTEPMAX, | 146 | .vp_vstepmax = OMAP3_VP_VSTEPMAX_VSTEPMAX, |
@@ -158,7 +157,6 @@ static struct omap_voltdm_pmic omap3_mpu_pmic = { | |||
158 | static struct omap_voltdm_pmic omap3_core_pmic = { | 157 | static struct omap_voltdm_pmic omap3_core_pmic = { |
159 | .slew_rate = 4000, | 158 | .slew_rate = 4000, |
160 | .step_size = 12500, | 159 | .step_size = 12500, |
161 | .volt_setup_time = 0xfff, | ||
162 | .vp_erroroffset = OMAP3_VP_CONFIG_ERROROFFSET, | 160 | .vp_erroroffset = OMAP3_VP_CONFIG_ERROROFFSET, |
163 | .vp_vstepmin = OMAP3_VP_VSTEPMIN_VSTEPMIN, | 161 | .vp_vstepmin = OMAP3_VP_VSTEPMIN_VSTEPMIN, |
164 | .vp_vstepmax = OMAP3_VP_VSTEPMAX_VSTEPMAX, | 162 | .vp_vstepmax = OMAP3_VP_VSTEPMAX_VSTEPMAX, |
@@ -175,7 +173,6 @@ static struct omap_voltdm_pmic omap3_core_pmic = { | |||
175 | static struct omap_voltdm_pmic omap4_mpu_pmic = { | 173 | static struct omap_voltdm_pmic omap4_mpu_pmic = { |
176 | .slew_rate = 4000, | 174 | .slew_rate = 4000, |
177 | .step_size = 12660, | 175 | .step_size = 12660, |
178 | .volt_setup_time = 0, | ||
179 | .vp_erroroffset = OMAP4_VP_CONFIG_ERROROFFSET, | 176 | .vp_erroroffset = OMAP4_VP_CONFIG_ERROROFFSET, |
180 | .vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN, | 177 | .vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN, |
181 | .vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX, | 178 | .vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX, |
@@ -193,7 +190,6 @@ static struct omap_voltdm_pmic omap4_mpu_pmic = { | |||
193 | static struct omap_voltdm_pmic omap4_iva_pmic = { | 190 | static struct omap_voltdm_pmic omap4_iva_pmic = { |
194 | .slew_rate = 4000, | 191 | .slew_rate = 4000, |
195 | .step_size = 12660, | 192 | .step_size = 12660, |
196 | .volt_setup_time = 0, | ||
197 | .vp_erroroffset = OMAP4_VP_CONFIG_ERROROFFSET, | 193 | .vp_erroroffset = OMAP4_VP_CONFIG_ERROROFFSET, |
198 | .vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN, | 194 | .vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN, |
199 | .vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX, | 195 | .vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX, |
@@ -211,7 +207,6 @@ static struct omap_voltdm_pmic omap4_iva_pmic = { | |||
211 | static struct omap_voltdm_pmic omap4_core_pmic = { | 207 | static struct omap_voltdm_pmic omap4_core_pmic = { |
212 | .slew_rate = 4000, | 208 | .slew_rate = 4000, |
213 | .step_size = 12660, | 209 | .step_size = 12660, |
214 | .volt_setup_time = 0, | ||
215 | .vp_erroroffset = OMAP4_VP_CONFIG_ERROROFFSET, | 210 | .vp_erroroffset = OMAP4_VP_CONFIG_ERROROFFSET, |
216 | .vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN, | 211 | .vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN, |
217 | .vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX, | 212 | .vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX, |
diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h index 990c440d5c51..78923f93efde 100644 --- a/arch/arm/mach-omap2/voltage.h +++ b/arch/arm/mach-omap2/voltage.h | |||
@@ -129,7 +129,6 @@ struct voltagedomain { | |||
129 | struct omap_voltdm_pmic { | 129 | struct omap_voltdm_pmic { |
130 | int slew_rate; | 130 | int slew_rate; |
131 | int step_size; | 131 | int step_size; |
132 | u16 volt_setup_time; | ||
133 | u16 i2c_slave_addr; | 132 | u16 i2c_slave_addr; |
134 | u16 volt_reg_addr; | 133 | u16 volt_reg_addr; |
135 | u16 cmd_reg_addr; | 134 | u16 cmd_reg_addr; |