diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-02-13 11:17:01 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-02-13 11:17:01 +0100 |
| commit | e72d344386bf80738fab7a6bd37cb321f443093a (patch) | |
| tree | d3e02055e6aa903ab80ef87c78d2f38e93981dcf /drivers/power/axp221.c | |
| parent | 258c98f8d36ef35d7cb7604847ba73e64d702c2a (diff) | |
| parent | bd2a4888b123713adec271d6c8040ca9f609aa2f (diff) | |
| download | u-boot-imx-e72d344386bf80738fab7a6bd37cb321f443093a.zip u-boot-imx-e72d344386bf80738fab7a6bd37cb321f443093a.tar.gz u-boot-imx-e72d344386bf80738fab7a6bd37cb321f443093a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'drivers/power/axp221.c')
| -rw-r--r-- | drivers/power/axp221.c | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c index 4c86f09..3e07f23 100644 --- a/drivers/power/axp221.c +++ b/drivers/power/axp221.c @@ -29,9 +29,7 @@ static int pmic_bus_init(void) #else int ret; - rsb_init(); - - ret = rsb_set_device_mode(AXP223_DEVICE_MODE_DATA); + ret = rsb_init(); if (ret) return ret; @@ -302,6 +300,39 @@ int axp221_set_aldo3(unsigned int mvolt) AXP221_OUTPUT_CTRL3_ALDO3_EN); } +int axp221_set_eldo(int eldo_num, unsigned int mvolt) +{ + int ret; + u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100); + u8 addr, bits; + + switch (eldo_num) { + case 3: + addr = AXP221_ELDO3_CTRL; + bits = AXP221_OUTPUT_CTRL2_ELDO3_EN; + break; + case 2: + addr = AXP221_ELDO2_CTRL; + bits = AXP221_OUTPUT_CTRL2_ELDO2_EN; + break; + case 1: + addr = AXP221_ELDO1_CTRL; + bits = AXP221_OUTPUT_CTRL2_ELDO1_EN; + break; + default: + return -EINVAL; + } + + if (mvolt == 0) + return axp221_clrbits(AXP221_OUTPUT_CTRL2, bits); + + ret = pmic_bus_write(addr, cfg); + if (ret) + return ret; + + return axp221_setbits(AXP221_OUTPUT_CTRL2, bits); +} + int axp221_init(void) { /* This cannot be 0 because it is used in SPL before BSS is ready */ |