--- arch/arm/mach-msm/board-vigor.c

+++ arch/arm/mach-msm/board-vigor.c

@@ -503,8 +503,8 @@ static struct regulator_init_data saw_s0

.constraints = {

.name = "8901_s0",

.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,

- .min_uV = 700000,

- .max_uV = 1600000,

+ .min_uV = CONFIG_CPU_FREQ_MIN_VDD,

+ .max_uV = CONFIG_CPU_FREQ_MAX_VDD,

},

.consumer_supplies = vreg_consumers_8901_S0,

.num_consumer_supplies = ARRAY_SIZE(vreg_consumers_8901_S0),

@@ -514,8 +514,8 @@ static struct regulator_init_data saw_s1

.constraints = {

.name = "8901_s1",

.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,

- .min_uV = 700000,

- .max_uV = 1600000,

+ .min_uV = CONFIG_CPU_FREQ_MIN_VDD,

+ .max_uV = CONFIG_CPU_FREQ_MAX_VDD,

},

.consumer_supplies = vreg_consumers_8901_S1,

.num_consumer_supplies = ARRAY_SIZE(vreg_consumers_8901_S1),

@@ -3802,8 +3802,8 @@ static struct regulator_consumer_supply

/* RPM early regulator constraints */

static struct rpm_regulator_init_data rpm_regulator_early_init_data[] = {

/* ID a_on pd ss min_uV max_uV init_ip freq */

- RPM_SMPS(PM8058_S0, 0, 1, 1, 500000, 1400000, SMPS_HMIN, 1p92),

- RPM_SMPS(PM8058_S1, 0, 1, 1, 500000, 1400000, SMPS_HMIN, 1p92),

+ RPM_SMPS(PM8058_S0, 0, 1, 1, 500000, CONFIG_CPU_FREQ_MAX_VDD, SMPS_HMIN, 1p92),

+ RPM_SMPS(PM8058_S1, 0, 1, 1, 500000, CONFIG_CPU_FREQ_MAX_VDD, SMPS_HMIN, 1p92),

};

/* RPM regulator constraints */