Skip to content

Commit

Permalink
power: axp: merge separate DLDO functions into 1
Browse files Browse the repository at this point in the history
Instead of one function for each DLDO regulator, make 1 function that
takes an extra "index". Since the control bits for the DLDO regulators
are contiguous, this makes the function very simple. This removes a lot
of duplicate code.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  • Loading branch information
wens authored and jwrdegoede committed Jan 26, 2016
1 parent c2caf65 commit 3517a27
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 76 deletions.
8 changes: 4 additions & 4 deletions board/sunxi/board.c
Original file line number Diff line number Diff line change
Expand Up @@ -466,10 +466,10 @@ void sunxi_board_init(void)
#endif

#ifdef CONFIG_AXP221_POWER
power_failed |= axp_set_dldo1(CONFIG_AXP_DLDO1_VOLT);
power_failed |= axp_set_dldo2(CONFIG_AXP_DLDO2_VOLT);
power_failed |= axp_set_dldo3(CONFIG_AXP_DLDO3_VOLT);
power_failed |= axp_set_dldo4(CONFIG_AXP_DLDO4_VOLT);
power_failed |= axp_set_dldo(1, CONFIG_AXP_DLDO1_VOLT);
power_failed |= axp_set_dldo(2, CONFIG_AXP_DLDO2_VOLT);
power_failed |= axp_set_dldo(3, CONFIG_AXP_DLDO3_VOLT);
power_failed |= axp_set_dldo(4, CONFIG_AXP_DLDO4_VOLT);
power_failed |= axp_set_eldo(1, CONFIG_AXP_ELDO1_VOLT);
power_failed |= axp_set_eldo(2, CONFIG_AXP_ELDO2_VOLT);
power_failed |= axp_set_eldo(3, CONFIG_AXP_ELDO3_VOLT);
Expand Down
88 changes: 20 additions & 68 deletions drivers/power/axp221.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,74 +116,6 @@ int axp_set_dcdc5(unsigned int mvolt)
AXP221_OUTPUT_CTRL1_DCDC5_EN);
}

int axp_set_dldo1(unsigned int mvolt)
{
int ret;
u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);

if (mvolt == 0)
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO1_EN);

ret = pmic_bus_write(AXP221_DLDO1_CTRL, cfg);
if (ret)
return ret;

return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO1_EN);
}

int axp_set_dldo2(unsigned int mvolt)
{
int ret;
u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);

if (mvolt == 0)
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO2_EN);

ret = pmic_bus_write(AXP221_DLDO2_CTRL, cfg);
if (ret)
return ret;

return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO2_EN);
}

int axp_set_dldo3(unsigned int mvolt)
{
int ret;
u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);

if (mvolt == 0)
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO3_EN);

ret = pmic_bus_write(AXP221_DLDO3_CTRL, cfg);
if (ret)
return ret;

return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO3_EN);
}

int axp_set_dldo4(unsigned int mvolt)
{
int ret;
u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);

if (mvolt == 0)
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO4_EN);

ret = pmic_bus_write(AXP221_DLDO4_CTRL, cfg);
if (ret)
return ret;

return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO4_EN);
}

int axp_set_aldo1(unsigned int mvolt)
{
int ret;
Expand Down Expand Up @@ -235,6 +167,26 @@ int axp_set_aldo3(unsigned int mvolt)
AXP221_OUTPUT_CTRL3_ALDO3_EN);
}

int axp_set_dldo(int dldo_num, unsigned int mvolt)
{
u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
int ret;

if (dldo_num < 1 || dldo_num > 4)
return -EINVAL;

if (mvolt == 0)
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO1_EN << (dldo_num - 1));

ret = pmic_bus_write(AXP221_DLDO1_CTRL + (dldo_num - 1), cfg);
if (ret)
return ret;

return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO1_EN << (dldo_num - 1));
}

int axp_set_eldo(int eldo_num, unsigned int mvolt)
{
int ret;
Expand Down
5 changes: 1 addition & 4 deletions include/axp_pmic.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ int axp_set_aldo1(unsigned int mvolt);
int axp_set_aldo2(unsigned int mvolt);
int axp_set_aldo3(unsigned int mvolt);
int axp_set_aldo4(unsigned int mvolt);
int axp_set_dldo1(unsigned int mvolt);
int axp_set_dldo2(unsigned int mvolt);
int axp_set_dldo3(unsigned int mvolt);
int axp_set_dldo4(unsigned int mvolt);
int axp_set_dldo(int dldo_num, unsigned int mvolt);
int axp_set_eldo(int eldo_num, unsigned int mvolt);
int axp_init(void);
int axp_get_sid(unsigned int *sid);
Expand Down

0 comments on commit 3517a27

Please sign in to comment.