Commit 5a84dc5b authored by Tero Kristo's avatar Tero Kristo Committed by Kevin Hilman

ARM: OMAP: TWL: change the vddmin / vddmax voltages to spec

As vddmin / vddmax voltages for the pmic only describe the pmic
capabilities now, change the voltages to be according to spec.
TWL data manuals give following values:

TWL4030 (SWCS019L) : VDD1: 600mV ... 1450mV, VDD2: 600mV ... 1500mV
TWL5030 (SWCS030E) : VDD1: 600mV ... 1450mV, VDD2: 600mV ... 1500mV
TWL6030 (SWCS045A) : 0V ... 2100mV
Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent d68ff977
...@@ -145,8 +145,8 @@ static struct omap_voltdm_pmic omap3_mpu_pmic = { ...@@ -145,8 +145,8 @@ static struct omap_voltdm_pmic omap3_mpu_pmic = {
.vp_erroroffset = OMAP3_VP_CONFIG_ERROROFFSET, .vp_erroroffset = OMAP3_VP_CONFIG_ERROROFFSET,
.vp_vstepmin = OMAP3_VP_VSTEPMIN_VSTEPMIN, .vp_vstepmin = OMAP3_VP_VSTEPMIN_VSTEPMIN,
.vp_vstepmax = OMAP3_VP_VSTEPMAX_VSTEPMAX, .vp_vstepmax = OMAP3_VP_VSTEPMAX_VSTEPMAX,
.vddmin = OMAP3430_VP1_VLIMITTO_VDDMIN, .vddmin = 600000,
.vddmax = OMAP3430_VP1_VLIMITTO_VDDMAX, .vddmax = 1450000,
.vp_timeout_us = OMAP3_VP_VLIMITTO_TIMEOUT_US, .vp_timeout_us = OMAP3_VP_VLIMITTO_TIMEOUT_US,
.i2c_slave_addr = OMAP3_SRI2C_SLAVE_ADDR, .i2c_slave_addr = OMAP3_SRI2C_SLAVE_ADDR,
.volt_reg_addr = OMAP3_VDD_MPU_SR_CONTROL_REG, .volt_reg_addr = OMAP3_VDD_MPU_SR_CONTROL_REG,
...@@ -162,8 +162,8 @@ static struct omap_voltdm_pmic omap3_core_pmic = { ...@@ -162,8 +162,8 @@ static struct omap_voltdm_pmic omap3_core_pmic = {
.vp_erroroffset = OMAP3_VP_CONFIG_ERROROFFSET, .vp_erroroffset = OMAP3_VP_CONFIG_ERROROFFSET,
.vp_vstepmin = OMAP3_VP_VSTEPMIN_VSTEPMIN, .vp_vstepmin = OMAP3_VP_VSTEPMIN_VSTEPMIN,
.vp_vstepmax = OMAP3_VP_VSTEPMAX_VSTEPMAX, .vp_vstepmax = OMAP3_VP_VSTEPMAX_VSTEPMAX,
.vddmin = OMAP3430_VP2_VLIMITTO_VDDMIN, .vddmin = 600000,
.vddmax = OMAP3430_VP2_VLIMITTO_VDDMAX, .vddmax = 1450000,
.vp_timeout_us = OMAP3_VP_VLIMITTO_TIMEOUT_US, .vp_timeout_us = OMAP3_VP_VLIMITTO_TIMEOUT_US,
.i2c_slave_addr = OMAP3_SRI2C_SLAVE_ADDR, .i2c_slave_addr = OMAP3_SRI2C_SLAVE_ADDR,
.volt_reg_addr = OMAP3_VDD_CORE_SR_CONTROL_REG, .volt_reg_addr = OMAP3_VDD_CORE_SR_CONTROL_REG,
...@@ -179,8 +179,8 @@ static struct omap_voltdm_pmic omap4_mpu_pmic = { ...@@ -179,8 +179,8 @@ static struct omap_voltdm_pmic omap4_mpu_pmic = {
.vp_erroroffset = OMAP4_VP_CONFIG_ERROROFFSET, .vp_erroroffset = OMAP4_VP_CONFIG_ERROROFFSET,
.vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN, .vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN,
.vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX, .vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX,
.vddmin = OMAP4_VP_MPU_VLIMITTO_VDDMIN, .vddmin = 0,
.vddmax = OMAP4_VP_MPU_VLIMITTO_VDDMAX, .vddmax = 2100000,
.vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US, .vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US,
.i2c_slave_addr = OMAP4_SRI2C_SLAVE_ADDR, .i2c_slave_addr = OMAP4_SRI2C_SLAVE_ADDR,
.volt_reg_addr = OMAP4_VDD_MPU_SR_VOLT_REG, .volt_reg_addr = OMAP4_VDD_MPU_SR_VOLT_REG,
...@@ -197,8 +197,8 @@ static struct omap_voltdm_pmic omap4_iva_pmic = { ...@@ -197,8 +197,8 @@ static struct omap_voltdm_pmic omap4_iva_pmic = {
.vp_erroroffset = OMAP4_VP_CONFIG_ERROROFFSET, .vp_erroroffset = OMAP4_VP_CONFIG_ERROROFFSET,
.vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN, .vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN,
.vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX, .vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX,
.vddmin = OMAP4_VP_IVA_VLIMITTO_VDDMIN, .vddmin = 0,
.vddmax = OMAP4_VP_IVA_VLIMITTO_VDDMAX, .vddmax = 2100000,
.vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US, .vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US,
.i2c_slave_addr = OMAP4_SRI2C_SLAVE_ADDR, .i2c_slave_addr = OMAP4_SRI2C_SLAVE_ADDR,
.volt_reg_addr = OMAP4_VDD_IVA_SR_VOLT_REG, .volt_reg_addr = OMAP4_VDD_IVA_SR_VOLT_REG,
...@@ -215,8 +215,8 @@ static struct omap_voltdm_pmic omap4_core_pmic = { ...@@ -215,8 +215,8 @@ static struct omap_voltdm_pmic omap4_core_pmic = {
.vp_erroroffset = OMAP4_VP_CONFIG_ERROROFFSET, .vp_erroroffset = OMAP4_VP_CONFIG_ERROROFFSET,
.vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN, .vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN,
.vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX, .vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX,
.vddmin = OMAP4_VP_CORE_VLIMITTO_VDDMIN, .vddmin = 0,
.vddmax = OMAP4_VP_CORE_VLIMITTO_VDDMAX, .vddmax = 2100000,
.vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US, .vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US,
.i2c_slave_addr = OMAP4_SRI2C_SLAVE_ADDR, .i2c_slave_addr = OMAP4_SRI2C_SLAVE_ADDR,
.volt_reg_addr = OMAP4_VDD_CORE_SR_VOLT_REG, .volt_reg_addr = OMAP4_VDD_CORE_SR_VOLT_REG,
...@@ -251,13 +251,6 @@ int __init omap3_twl_init(void) ...@@ -251,13 +251,6 @@ int __init omap3_twl_init(void)
if (!cpu_is_omap34xx()) if (!cpu_is_omap34xx())
return -ENODEV; return -ENODEV;
if (cpu_is_omap3630()) {
omap3_mpu_pmic.vddmin = OMAP3630_VP1_VLIMITTO_VDDMIN;
omap3_mpu_pmic.vddmax = OMAP3630_VP1_VLIMITTO_VDDMAX;
omap3_core_pmic.vddmin = OMAP3630_VP2_VLIMITTO_VDDMIN;
omap3_core_pmic.vddmax = OMAP3630_VP2_VLIMITTO_VDDMAX;
}
/* /*
* The smartreflex bit on twl4030 specifies if the setting of voltage * The smartreflex bit on twl4030 specifies if the setting of voltage
* is done over the I2C_SR path. Since this setting is independent of * is done over the I2C_SR path. Since this setting is independent of
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment