diff options
author | Kevin Hilman <khilman@ti.com> | 2011-03-22 17:12:37 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2011-09-15 14:39:11 -0400 |
commit | e74e44054f8297d60fbd2ed1d412d84055afee8c (patch) | |
tree | 2bbfb22023db5153b809653f73bbd0a08ab5ad92 /arch/arm/mach-omap2/omap_twl.c | |
parent | 01f48d308db1cfcfb0151d8d91153fd73e84ae40 (diff) |
OMAP2+: VC: support PMICs with separate voltage and command registers
The VC layer can support PMICs with separate voltage and command
registers by putting the different registers in the PRM_VC_SMPS_VOL_RA
and PRCM_VC_SMPS_CMD_RA registers respectively.
The PMIC data must supply at least a voltage register address
(volt_reg_addr). The command register address (cmd_reg_addr) is
optional. If the PMIC data does not supply a separate command
register address, the VC will use the voltage register address for both.
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_twl.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_twl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c index 760487bcfca6..3249fe3c3c1d 100644 --- a/arch/arm/mach-omap2/omap_twl.c +++ b/arch/arm/mach-omap2/omap_twl.c | |||
@@ -158,7 +158,7 @@ static struct omap_volt_pmic_info omap3_mpu_volt_info = { | |||
158 | .vp_vddmax = OMAP3430_VP1_VLIMITTO_VDDMAX, | 158 | .vp_vddmax = OMAP3430_VP1_VLIMITTO_VDDMAX, |
159 | .vp_timeout_us = OMAP3_VP_VLIMITTO_TIMEOUT_US, | 159 | .vp_timeout_us = OMAP3_VP_VLIMITTO_TIMEOUT_US, |
160 | .i2c_slave_addr = OMAP3_SRI2C_SLAVE_ADDR, | 160 | .i2c_slave_addr = OMAP3_SRI2C_SLAVE_ADDR, |
161 | .pmic_reg = OMAP3_VDD_MPU_SR_CONTROL_REG, | 161 | .volt_reg_addr = OMAP3_VDD_MPU_SR_CONTROL_REG, |
162 | .vsel_to_uv = twl4030_vsel_to_uv, | 162 | .vsel_to_uv = twl4030_vsel_to_uv, |
163 | .uv_to_vsel = twl4030_uv_to_vsel, | 163 | .uv_to_vsel = twl4030_uv_to_vsel, |
164 | }; | 164 | }; |
@@ -178,7 +178,7 @@ static struct omap_volt_pmic_info omap3_core_volt_info = { | |||
178 | .vp_vddmax = OMAP3430_VP2_VLIMITTO_VDDMAX, | 178 | .vp_vddmax = OMAP3430_VP2_VLIMITTO_VDDMAX, |
179 | .vp_timeout_us = OMAP3_VP_VLIMITTO_TIMEOUT_US, | 179 | .vp_timeout_us = OMAP3_VP_VLIMITTO_TIMEOUT_US, |
180 | .i2c_slave_addr = OMAP3_SRI2C_SLAVE_ADDR, | 180 | .i2c_slave_addr = OMAP3_SRI2C_SLAVE_ADDR, |
181 | .pmic_reg = OMAP3_VDD_CORE_SR_CONTROL_REG, | 181 | .volt_reg_addr = OMAP3_VDD_CORE_SR_CONTROL_REG, |
182 | .vsel_to_uv = twl4030_vsel_to_uv, | 182 | .vsel_to_uv = twl4030_vsel_to_uv, |
183 | .uv_to_vsel = twl4030_uv_to_vsel, | 183 | .uv_to_vsel = twl4030_uv_to_vsel, |
184 | }; | 184 | }; |
@@ -198,7 +198,7 @@ static struct omap_volt_pmic_info omap4_mpu_volt_info = { | |||
198 | .vp_vddmax = OMAP4_VP_MPU_VLIMITTO_VDDMAX, | 198 | .vp_vddmax = OMAP4_VP_MPU_VLIMITTO_VDDMAX, |
199 | .vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US, | 199 | .vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US, |
200 | .i2c_slave_addr = OMAP4_SRI2C_SLAVE_ADDR, | 200 | .i2c_slave_addr = OMAP4_SRI2C_SLAVE_ADDR, |
201 | .pmic_reg = OMAP4_VDD_MPU_SR_VOLT_REG, | 201 | .volt_reg_addr = OMAP4_VDD_MPU_SR_VOLT_REG, |
202 | .vsel_to_uv = twl6030_vsel_to_uv, | 202 | .vsel_to_uv = twl6030_vsel_to_uv, |
203 | .uv_to_vsel = twl6030_uv_to_vsel, | 203 | .uv_to_vsel = twl6030_uv_to_vsel, |
204 | }; | 204 | }; |
@@ -218,7 +218,7 @@ static struct omap_volt_pmic_info omap4_iva_volt_info = { | |||
218 | .vp_vddmax = OMAP4_VP_IVA_VLIMITTO_VDDMAX, | 218 | .vp_vddmax = OMAP4_VP_IVA_VLIMITTO_VDDMAX, |
219 | .vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US, | 219 | .vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US, |
220 | .i2c_slave_addr = OMAP4_SRI2C_SLAVE_ADDR, | 220 | .i2c_slave_addr = OMAP4_SRI2C_SLAVE_ADDR, |
221 | .pmic_reg = OMAP4_VDD_IVA_SR_VOLT_REG, | 221 | .volt_reg_addr = OMAP4_VDD_IVA_SR_VOLT_REG, |
222 | .vsel_to_uv = twl6030_vsel_to_uv, | 222 | .vsel_to_uv = twl6030_vsel_to_uv, |
223 | .uv_to_vsel = twl6030_uv_to_vsel, | 223 | .uv_to_vsel = twl6030_uv_to_vsel, |
224 | }; | 224 | }; |
@@ -238,7 +238,7 @@ static struct omap_volt_pmic_info omap4_core_volt_info = { | |||
238 | .vp_vddmax = OMAP4_VP_CORE_VLIMITTO_VDDMAX, | 238 | .vp_vddmax = OMAP4_VP_CORE_VLIMITTO_VDDMAX, |
239 | .vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US, | 239 | .vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US, |
240 | .i2c_slave_addr = OMAP4_SRI2C_SLAVE_ADDR, | 240 | .i2c_slave_addr = OMAP4_SRI2C_SLAVE_ADDR, |
241 | .pmic_reg = OMAP4_VDD_CORE_SR_VOLT_REG, | 241 | .volt_reg_addr = OMAP4_VDD_CORE_SR_VOLT_REG, |
242 | .vsel_to_uv = twl6030_vsel_to_uv, | 242 | .vsel_to_uv = twl6030_vsel_to_uv, |
243 | .uv_to_vsel = twl6030_uv_to_vsel, | 243 | .uv_to_vsel = twl6030_uv_to_vsel, |
244 | }; | 244 | }; |