diff options
| -rw-r--r-- | arch/arm/mach-omap2/omap_twl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c index 6b247d183299..a66bf6b9fb05 100644 --- a/arch/arm/mach-omap2/omap_twl.c +++ b/arch/arm/mach-omap2/omap_twl.c | |||
| @@ -106,9 +106,9 @@ static unsigned long twl6030_vsel_to_uv(const u8 vsel) | |||
| 106 | return 1350000; | 106 | return 1350000; |
| 107 | 107 | ||
| 108 | if (smps_offset & 0x8) | 108 | if (smps_offset & 0x8) |
| 109 | return ((((vsel - 1) * 125) + 7000)) * 100; | 109 | return ((((vsel - 1) * 1266) + 70900)) * 10; |
| 110 | else | 110 | else |
| 111 | return ((((vsel - 1) * 125) + 6000)) * 100; | 111 | return ((((vsel - 1) * 1266) + 60770)) * 10; |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | static u8 twl6030_uv_to_vsel(unsigned long uv) | 114 | static u8 twl6030_uv_to_vsel(unsigned long uv) |
| @@ -138,9 +138,9 @@ static u8 twl6030_uv_to_vsel(unsigned long uv) | |||
| 138 | return 0x3A; | 138 | return 0x3A; |
| 139 | 139 | ||
| 140 | if (smps_offset & 0x8) | 140 | if (smps_offset & 0x8) |
| 141 | return DIV_ROUND_UP(uv - 700000, 12500) + 1; | 141 | return DIV_ROUND_UP(uv - 709000, 12660) + 1; |
| 142 | else | 142 | else |
| 143 | return DIV_ROUND_UP(uv - 600000, 12500) + 1; | 143 | return DIV_ROUND_UP(uv - 607700, 12660) + 1; |
| 144 | } | 144 | } |
| 145 | 145 | ||
| 146 | static struct omap_voltdm_pmic omap3_mpu_pmic = { | 146 | static struct omap_voltdm_pmic omap3_mpu_pmic = { |
| @@ -187,7 +187,7 @@ static struct omap_voltdm_pmic omap3_core_pmic = { | |||
| 187 | 187 | ||
| 188 | static struct omap_voltdm_pmic omap4_mpu_pmic = { | 188 | static struct omap_voltdm_pmic omap4_mpu_pmic = { |
| 189 | .slew_rate = 4000, | 189 | .slew_rate = 4000, |
| 190 | .step_size = 12500, | 190 | .step_size = 12660, |
| 191 | .on_volt = 1350000, | 191 | .on_volt = 1350000, |
| 192 | .onlp_volt = 1350000, | 192 | .onlp_volt = 1350000, |
| 193 | .ret_volt = 837500, | 193 | .ret_volt = 837500, |
| @@ -208,7 +208,7 @@ static struct omap_voltdm_pmic omap4_mpu_pmic = { | |||
| 208 | 208 | ||
| 209 | static struct omap_voltdm_pmic omap4_iva_pmic = { | 209 | static struct omap_voltdm_pmic omap4_iva_pmic = { |
| 210 | .slew_rate = 4000, | 210 | .slew_rate = 4000, |
| 211 | .step_size = 12500, | 211 | .step_size = 12660, |
| 212 | .on_volt = 1100000, | 212 | .on_volt = 1100000, |
| 213 | .onlp_volt = 1100000, | 213 | .onlp_volt = 1100000, |
| 214 | .ret_volt = 837500, | 214 | .ret_volt = 837500, |
| @@ -229,7 +229,7 @@ static struct omap_voltdm_pmic omap4_iva_pmic = { | |||
| 229 | 229 | ||
| 230 | static struct omap_voltdm_pmic omap4_core_pmic = { | 230 | static struct omap_voltdm_pmic omap4_core_pmic = { |
| 231 | .slew_rate = 4000, | 231 | .slew_rate = 4000, |
| 232 | .step_size = 12500, | 232 | .step_size = 12660, |
| 233 | .on_volt = 1100000, | 233 | .on_volt = 1100000, |
| 234 | .onlp_volt = 1100000, | 234 | .onlp_volt = 1100000, |
| 235 | .ret_volt = 837500, | 235 | .ret_volt = 837500, |
