diff options
| author | merge <null@invalid> | 2008-12-02 11:35:57 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-02 11:35:57 +0000 |
| commit | 80af66b5b7d6c4f76108150dd57a1303bb9d4051 (patch) | |
| tree | 1d3ddcfd5166fd8b671adebee2efa96bace0996d /arch/arm/mach-s3c2440 | |
| parent | 9205fa7206e2fcd5d6e23670f5d8c215fc999874 (diff) | |
MERGE-andy-tracking-patchset-edits
Diffstat (limited to 'arch/arm/mach-s3c2440')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 4c4e1dec6ec..61713afb1f6 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -648,6 +648,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .min_uV = 3300000, .max_uV = 3300000, .valid_modes_mask = REGULATOR_MODE_NORMAL, + .boot_on = 1, .apply_uV = 1, .state_mem = { .enabled = 1, @@ -660,6 +661,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .min_uV = 1300000, .max_uV = 1600000, .valid_modes_mask = REGULATOR_MODE_NORMAL, + .boot_on = 1, .apply_uV = 1, }, .num_consumer_supplies = 0, @@ -670,6 +672,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .max_uV = 1800000, .valid_modes_mask = REGULATOR_MODE_NORMAL, .apply_uV = 1, + .boot_on = 1, .state_mem = { .enabled = 1, }, @@ -682,6 +685,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .max_uV = 3300000, .valid_modes_mask = REGULATOR_MODE_NORMAL, .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, + .boot_on = 1, }, .num_consumer_supplies = 1, .consumer_supplies = hcldo_consumers, @@ -738,9 +742,6 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .min_uV = 0, .max_uV = 3300000, .valid_modes_mask = REGULATOR_MODE_NORMAL, - .state_mem = { - .enabled = 1, - }, }, .num_consumer_supplies = 0, }, |