Reverese mangle_pmu logic. Initalize regulator constrains to those used for all but GTA02v1 and changed them for GTA02v1 in mangle_pmu.

SVN-Revision: 16866
owl
Lars-Peter Clausen 2009-07-16 13:13:25 +00:00
parent 93d3f098eb
commit 7bf05123f8
1 changed files with 16 additions and 22 deletions

View File

@ -624,8 +624,8 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
[PCF50633_REGULATOR_LDO1] = { [PCF50633_REGULATOR_LDO1] = {
.constraints = { .constraints = {
.name = "GSENSOR_3V3", .name = "GSENSOR_3V3",
.min_uV = 1300000, .min_uV = 3300000,
.max_uV = 1300000, .max_uV = 3300000,
.valid_modes_mask = REGULATOR_MODE_NORMAL, .valid_modes_mask = REGULATOR_MODE_NORMAL,
.apply_uV = 1, .apply_uV = 1,
}, },
@ -664,8 +664,8 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
[PCF50633_REGULATOR_LDO5] = { [PCF50633_REGULATOR_LDO5] = {
.constraints = { .constraints = {
.name = "RF_3V", .name = "RF_3V",
.min_uV = 1500000, .min_uV = 3000000,
.max_uV = 1500000, .max_uV = 3000000,
.valid_modes_mask = REGULATOR_MODE_NORMAL, .valid_modes_mask = REGULATOR_MODE_NORMAL,
.apply_uV = 1, .apply_uV = 1,
.state_mem = { .state_mem = {
@ -678,10 +678,11 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
[PCF50633_REGULATOR_LDO6] = { [PCF50633_REGULATOR_LDO6] = {
.constraints = { .constraints = {
.name = "LCM_3V", .name = "LCM_3V",
.min_uV = 0, .min_uV = 3000000,
.max_uV = 3300000, .max_uV = 3000000,
.always_on = 1, .always_on = 1,
.valid_modes_mask = REGULATOR_MODE_NORMAL, .valid_modes_mask = REGULATOR_MODE_NORMAL,
.apply_uV = 1,
}, },
.num_consumer_supplies = 0, .num_consumer_supplies = 0,
}, },
@ -715,28 +716,21 @@ static void mangle_pmu_pdata_by_system_rev(void)
/* FIXME: this is only in v1 due to wrong PMU variant */ /* FIXME: this is only in v1 due to wrong PMU variant */
reg_init_data[PCF50633_REGULATOR_DOWN2] reg_init_data[PCF50633_REGULATOR_DOWN2]
.constraints.state_mem.enabled = 1; .constraints.state_mem.enabled = 1;
break;
case GTA02v2_SYSTEM_REV:
case GTA02v3_SYSTEM_REV:
case GTA02v4_SYSTEM_REV:
case GTA02v5_SYSTEM_REV:
case GTA02v6_SYSTEM_REV:
reg_init_data[PCF50633_REGULATOR_LDO1] reg_init_data[PCF50633_REGULATOR_LDO1]
.constraints.min_uV = 3300000; .constraints.min_uV = 1300000;
reg_init_data[PCF50633_REGULATOR_LDO1] reg_init_data[PCF50633_REGULATOR_LDO1]
.constraints.min_uV = 3300000; .constraints.max_uV = 1300000;
reg_init_data[PCF50633_REGULATOR_LDO1]
.constraints.state_mem.enabled = 0;
reg_init_data[PCF50633_REGULATOR_LDO5] reg_init_data[PCF50633_REGULATOR_LDO5]
.constraints.min_uV = 3000000; .constraints.min_uV = 1500000;
reg_init_data[PCF50633_REGULATOR_LDO5] reg_init_data[PCF50633_REGULATOR_LDO5]
.constraints.max_uV = 3000000; .constraints.max_uV = 1500000;
reg_init_data[PCF50633_REGULATOR_LDO6] reg_init_data[PCF50633_REGULATOR_LDO6]
.constraints.min_uV = 3000000; .constraints.min_uV = 0;
reg_init_data[PCF50633_REGULATOR_LDO6] reg_init_data[PCF50633_REGULATOR_LDO6]
.constraints.max_uV = 3000000; .constraints.max_uV = 3300000;
reg_init_data[PCF50633_REGULATOR_LDO6] reg_init_data[PCF50633_REGULATOR_LDO6]
.constraints.apply_uV = 1; .constraints.apply_uV = 1;
break; break;