diff options
| -rw-r--r-- | arch/arm/mach-omap2/omap_tps6236x.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/voltage.h | 11 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/voltagedomains44xx_data.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/vp44xx_data.c | 3 |
4 files changed, 19 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/omap_tps6236x.c b/arch/arm/mach-omap2/omap_tps6236x.c index bae0cf5..773aa80 100644 --- a/arch/arm/mach-omap2/omap_tps6236x.c +++ b/arch/arm/mach-omap2/omap_tps6236x.c @@ -188,7 +188,7 @@ static struct omap_voltdm_pmic omap4_mpu_pmic = { .vp_vstepmin = OMAP4_VP_VSTEPMIN_VSTEPMIN, .vp_vstepmax = OMAP4_VP_VSTEPMAX_VSTEPMAX, .min_volt = OMAP4_VP_MPU_VLIMITTO_VDDMIN, - .max_volt = OMAP4_VP_MPU_VLIMITTO_VDDMAX, + .max_volt = OMAP4460_VP_MPU_VLIMITTO_VDDMAX, .vp_timeout_us = OMAP4_VP_VLIMITTO_TIMEOUT_US, .i2c_slave_addr = I2C_TPS6236X_SLAVE_ADDR, .volt_reg_addr = REG_TPS6236X_SET_0, diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h index f4a10b8..e59f8ad 100644 --- a/arch/arm/mach-omap2/voltage.h +++ b/arch/arm/mach-omap2/voltage.h @@ -187,11 +187,16 @@ struct omap_volt_data { #define OMAP3_VP_VLIMITTO_TIMEOUT_US 200 #define OMAP4_VP_MPU_VLIMITTO_VDDMIN 830000 -#define OMAP4_VP_MPU_VLIMITTO_VDDMAX 1410000 #define OMAP4_VP_IVA_VLIMITTO_VDDMIN 830000 -#define OMAP4_VP_IVA_VLIMITTO_VDDMAX 1260000 #define OMAP4_VP_CORE_VLIMITTO_VDDMIN 830000 -#define OMAP4_VP_CORE_VLIMITTO_VDDMAX 1200000 + +#define OMAP4430_VP_MPU_VLIMITTO_VDDMAX 1360000 +#define OMAP4430_VP_IVA_VLIMITTO_VDDMAX 1240000 +#define OMAP4430_VP_CORE_VLIMITTO_VDDMAX 1170000 + +#define OMAP4460_VP_MPU_VLIMITTO_VDDMAX 1380000 +#define OMAP4460_VP_IVA_VLIMITTO_VDDMAX 1375000 +#define OMAP4460_VP_CORE_VLIMITTO_VDDMAX 1250000 #define OMAP4_VP_CONFIG_ERROROFFSET 0x00 #define OMAP4_VP_VSTEPMIN_VSTEPMIN 0x01 diff --git a/arch/arm/mach-omap2/voltagedomains44xx_data.c b/arch/arm/mach-omap2/voltagedomains44xx_data.c index aba2090..f2310b8 100644 --- a/arch/arm/mach-omap2/voltagedomains44xx_data.c +++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c @@ -132,6 +132,10 @@ void __init omap44xx_voltagedomains_init(void) struct voltagedomain *voltdm; int i; + omap4_voltdm_mpu.vp->vlimits->vddmax = OMAP4460_VP_MPU_VLIMITTO_VDDMAX; + omap4_voltdm_iva.vp->vlimits->vddmax = OMAP4460_VP_IVA_VLIMITTO_VDDMAX; + omap4_voltdm_core.vp->vlimits->vddmax = OMAP4460_VP_CORE_VLIMITTO_VDDMAX; + /* * XXX Will depend on the process, validation, and binning * for the currently-running IC @@ -149,6 +153,12 @@ void __init omap44xx_voltagedomains_init(void) omap4_vdd_core_info.volt_data = omap443x_vdd_core_volt_data; omap4_vdd_mpu_info.dep_vdd_info = omap443x_vddmpu_dep_info; omap4_vdd_iva_info.dep_vdd_info = omap443x_vddiva_dep_info; + omap4_voltdm_mpu.vp->vlimits->vddmax = + OMAP4430_VP_MPU_VLIMITTO_VDDMAX; + omap4_voltdm_iva.vp->vlimits->vddmax = + OMAP4430_VP_IVA_VLIMITTO_VDDMAX; + omap4_voltdm_core.vp->vlimits->vddmax = + OMAP4430_VP_CORE_VLIMITTO_VDDMAX; } else if (cpu_is_omap446x()) { omap4_vdd_mpu_info.volt_data = omap446x_vdd_mpu_volt_data; omap4_vdd_iva_info.volt_data = omap446x_vdd_iva_volt_data; diff --git a/arch/arm/mach-omap2/vp44xx_data.c b/arch/arm/mach-omap2/vp44xx_data.c index e82b415..fb16d7f 100644 --- a/arch/arm/mach-omap2/vp44xx_data.c +++ b/arch/arm/mach-omap2/vp44xx_data.c @@ -66,7 +66,6 @@ static const struct omap_vp_common omap4_vp_common = { struct omap_vp_volt_limits omap4_vp_mpu_limit = { .vddmin = OMAP4_VP_MPU_VLIMITTO_VDDMIN, - .vddmax = OMAP4_VP_MPU_VLIMITTO_VDDMAX, }; struct omap_vp_instance omap4_vp_mpu = { @@ -83,7 +82,6 @@ struct omap_vp_instance omap4_vp_mpu = { struct omap_vp_volt_limits omap4_vp_iva_limit = { .vddmin = OMAP4_VP_IVA_VLIMITTO_VDDMIN, - .vddmax = OMAP4_VP_IVA_VLIMITTO_VDDMAX, }; struct omap_vp_instance omap4_vp_iva = { @@ -100,7 +98,6 @@ struct omap_vp_instance omap4_vp_iva = { struct omap_vp_volt_limits omap4_vp_core_limit = { .vddmin = OMAP4_VP_CORE_VLIMITTO_VDDMIN, - .vddmax = OMAP4_VP_CORE_VLIMITTO_VDDMAX, }; struct omap_vp_instance omap4_vp_core = { |