diff options
author | Igor Grinberg <grinberg@compulab.co.il> | 2010-03-09 04:43:51 -0500 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-05-11 11:25:02 -0400 |
commit | d176d64b54c72ee00f825dddd63830f8bd2b5155 (patch) | |
tree | 01b0d836c8a2bf73d370752d77de1d1db70d8f2f /arch/arm/mach-pxa/cm-x300.c | |
parent | e4e309708eeb87a5b2429bc1f9bd1bc469d5a8b0 (diff) |
[ARM] pxa/cm-x300: add regulator on vcc_core
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/cm-x300.c')
-rw-r--r-- | arch/arm/mach-pxa/cm-x300.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index 6fba9a08f53e..2012588fb200 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/i2c/pca953x.h> | 30 | #include <linux/i2c/pca953x.h> |
31 | 31 | ||
32 | #include <linux/mfd/da903x.h> | 32 | #include <linux/mfd/da903x.h> |
33 | #include <linux/regulator/machine.h> | ||
33 | #include <linux/power_supply.h> | 34 | #include <linux/power_supply.h> |
34 | #include <linux/apm-emulation.h> | 35 | #include <linux/apm-emulation.h> |
35 | 36 | ||
@@ -634,6 +635,27 @@ struct da9030_battery_info cm_x300_battery_info = { | |||
634 | .battery_critical = cm_x300_battery_critical, | 635 | .battery_critical = cm_x300_battery_critical, |
635 | }; | 636 | }; |
636 | 637 | ||
638 | static struct regulator_consumer_supply buck2_consumers[] = { | ||
639 | { | ||
640 | .dev = NULL, | ||
641 | .supply = "vcc_core", | ||
642 | }, | ||
643 | }; | ||
644 | |||
645 | static struct regulator_init_data buck2_data = { | ||
646 | .constraints = { | ||
647 | .min_uV = 1375000, | ||
648 | .max_uV = 1375000, | ||
649 | .state_mem = { | ||
650 | .enabled = 0, | ||
651 | }, | ||
652 | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, | ||
653 | .apply_uV = 1, | ||
654 | }, | ||
655 | .num_consumer_supplies = ARRAY_SIZE(buck2_consumers), | ||
656 | .consumer_supplies = buck2_consumers, | ||
657 | }; | ||
658 | |||
637 | /* DA9030 */ | 659 | /* DA9030 */ |
638 | struct da903x_subdev_info cm_x300_da9030_subdevs[] = { | 660 | struct da903x_subdev_info cm_x300_da9030_subdevs[] = { |
639 | { | 661 | { |
@@ -641,6 +663,11 @@ struct da903x_subdev_info cm_x300_da9030_subdevs[] = { | |||
641 | .id = DA9030_ID_BAT, | 663 | .id = DA9030_ID_BAT, |
642 | .platform_data = &cm_x300_battery_info, | 664 | .platform_data = &cm_x300_battery_info, |
643 | }, | 665 | }, |
666 | { | ||
667 | .name = "da903x-regulator", | ||
668 | .id = DA9030_ID_BUCK2, | ||
669 | .platform_data = &buck2_data, | ||
670 | }, | ||
644 | }; | 671 | }; |
645 | 672 | ||
646 | static struct da903x_platform_data cm_x300_da9030_info = { | 673 | static struct da903x_platform_data cm_x300_da9030_info = { |