Re: [U-Boot] [linux-sunxi] Re: [PATCH 1/2] sunxi: power: add AXP803 support

On Fri, Jan 06, 2017 at 06:47:30AM +0800, Icenowy Zheng wrote:

...

...

+++ b/drivers/power/axp803.c @@ -0,0 +1,255 @@ +/*

• • AXP803 driver based on AXP818 driver
• • Based on axp818.c
• • (C) Copyright 2015 Vishnu Patekar vishnuptekar0510@gmail.com
• • Based on axp221.c
• • (C) Copyright 2014 Hans de Goede hdegoede@redhat.com
• • (C) Copyright 2013 Oliver Schinagl oliver@schinagl.nl
• • SPDX-License-Identifier: GPL-2.0+
• */

+#include <common.h> +#include <errno.h> +#include <asm/arch/gpio.h> +#include <asm/arch/pmic_bus.h> +#include <axp_pmic.h>

+static u8 axp803_mvolt_to_cfg(int mvolt, int min, int max, int div) +{

• if (mvolt < min)
• mvolt = min;
• else if (mvolt > max)
• mvolt = max;
• return  (mvolt - min) / div;

+}

+int axp_set_dcdc1(unsigned int mvolt) +{

• int ret;
• u8 cfg = axp803_mvolt_to_cfg(mvolt, 1600, 3400, 100);
• if (mvolt == 0)
• return pmic_bus_clrbits(AXP803_OUTPUT_CTRL1,
• AXP803_OUTPUT_CTRL1_DCDC1_EN);
• ret = pmic_bus_write(AXP803_DCDC1_CTRL, cfg);
• if (ret)
• return ret;
• return pmic_bus_setbits(AXP803_OUTPUT_CTRL1,
• AXP803_OUTPUT_CTRL1_DCDC1_EN);

+}

+int axp_set_dcdc2(unsigned int mvolt) +{

• int ret;
• u8 cfg;
• if (mvolt >= 1220)
• cfg = 70 + axp803_mvolt_to_cfg(mvolt, 1220, 1300, 20);
• else
• cfg = axp803_mvolt_to_cfg(mvolt, 500, 1200, 10);
• if (mvolt == 0)
• return pmic_bus_clrbits(AXP803_OUTPUT_CTRL1,
• AXP803_OUTPUT_CTRL1_DCDC2_EN);
• ret = pmic_bus_write(AXP803_DCDC2_CTRL, cfg);
• if (ret)
• return ret;
• return pmic_bus_setbits(AXP803_OUTPUT_CTRL1,
• AXP803_OUTPUT_CTRL1_DCDC2_EN);

+}

+int axp_set_dcdc3(unsigned int mvolt) +{

• int ret;
• u8 cfg;
• if (mvolt >= 1220)
• cfg = 70 + axp803_mvolt_to_cfg(mvolt, 1220, 1300, 20);
• else
• cfg = axp803_mvolt_to_cfg(mvolt, 500, 1200, 10);
• if (mvolt == 0)
• return pmic_bus_clrbits(AXP803_OUTPUT_CTRL1,
• AXP803_OUTPUT_CTRL1_DCDC3_EN);
• ret = pmic_bus_write(AXP803_DCDC3_CTRL, cfg);
• if (ret)
• return ret;
• return pmic_bus_setbits(AXP803_OUTPUT_CTRL1,
• AXP803_OUTPUT_CTRL1_DCDC3_EN);

+}

+int axp_set_dcdc5(unsigned int mvolt) +{

• int ret;
• u8 cfg;
• if (mvolt >= 1140)
• cfg = 32 + axp803_mvolt_to_cfg(mvolt, 1140, 1840, 20);
• else
• cfg = axp803_mvolt_to_cfg(mvolt, 800, 1120, 10);
• if (mvolt == 0)
• return pmic_bus_clrbits(AXP803_OUTPUT_CTRL1,
• AXP803_OUTPUT_CTRL1_DCDC5_EN);
• ret = pmic_bus_write(AXP803_DCDC5_CTRL, cfg);
• if (ret)
• return ret;
• return pmic_bus_setbits(AXP803_OUTPUT_CTRL1,
• AXP803_OUTPUT_CTRL1_DCDC5_EN);

+}

+int axp_set_aldo(int aldo_num, unsigned int mvolt) +{

• int ret;
• u8 cfg;
• if (aldo_num < 1 || aldo_num > 3)
• return -EINVAL;
• if (mvolt == 0)
• return pmic_bus_clrbits(AXP803_OUTPUT_CTRL3,
• AXP803_OUTPUT_CTRL3_ALDO1_EN << (aldo_num - 1));
• cfg = axp803_mvolt_to_cfg(mvolt, 700, 3300, 100);
• ret = pmic_bus_write(AXP803_ALDO1_CTRL + (aldo_num - 1), cfg);
• if (ret)
• return ret;
• return pmic_bus_setbits(AXP803_OUTPUT_CTRL3,
• AXP803_OUTPUT_CTRL3_ALDO1_EN << (aldo_num - 1));

+}

+/* TODO: re-work other AXP drivers to consolidate ALDO functions. */ +int axp_set_aldo1(unsigned int mvolt) +{

• return axp_set_aldo(1, mvolt);

+}

+int axp_set_aldo2(unsigned int mvolt) +{

• return axp_set_aldo(2, mvolt);

+}

+int axp_set_aldo3(unsigned int mvolt) +{

• return axp_set_aldo(3, mvolt);

+}

+int axp_set_dldo(int dldo_num, unsigned int mvolt) +{

• int ret;
• u8 cfg;
• if (dldo_num < 1 || dldo_num > 4)
• return -EINVAL;
• if (mvolt == 0)
• return pmic_bus_clrbits(AXP803_OUTPUT_CTRL2,
• AXP803_OUTPUT_CTRL2_DLDO1_EN << (dldo_num - 1));
• cfg = axp803_mvolt_to_cfg(mvolt, 700, 3300, 100);
• if (dldo_num == 2 && mvolt > 3300)
• cfg += 1 + axp803_mvolt_to_cfg(mvolt, 3400, 4200, 200);
• ret = pmic_bus_write(AXP803_DLDO1_CTRL + (dldo_num - 1), cfg);
• if (ret)
• return ret;
• return pmic_bus_setbits(AXP803_OUTPUT_CTRL2,
• AXP803_OUTPUT_CTRL2_DLDO1_EN << (dldo_num - 1));

+}

+int axp_set_eldo(int eldo_num, unsigned int mvolt) +{

• int ret;
• u8 cfg;
• if (eldo_num < 1 || eldo_num > 3)
• return -EINVAL;
• if (mvolt == 0)
• return pmic_bus_clrbits(AXP803_OUTPUT_CTRL2,
• AXP803_OUTPUT_CTRL2_ELDO1_EN << (eldo_num - 1));
• cfg = axp803_mvolt_to_cfg(mvolt, 700, 1900, 50);
• ret = pmic_bus_write(AXP803_ELDO1_CTRL + (eldo_num - 1), cfg);
• if (ret)
• return ret;
• return pmic_bus_setbits(AXP803_OUTPUT_CTRL2,
• AXP803_OUTPUT_CTRL2_ELDO1_EN << (eldo_num - 1));

+}

+int axp_set_fldo(int fldo_num, unsigned int mvolt) +{

• int ret;
• u8 cfg;
• if (fldo_num < 1 || fldo_num > 2)
• return -EINVAL;
• if (mvolt == 0)
• return pmic_bus_clrbits(AXP803_OUTPUT_CTRL3,
• AXP803_OUTPUT_CTRL3_FLDO1_EN << (fldo_num - 1));
• cfg = axp803_mvolt_to_cfg(mvolt, 700, 1450, 50);
• ret = pmic_bus_write(AXP803_FLDO1_CTRL + (fldo_num - 1), cfg);
• if (ret)
• return ret;
• return pmic_bus_setbits(AXP803_OUTPUT_CTRL3,
• AXP803_OUTPUT_CTRL3_FLDO1_EN << (fldo_num - 1));

+}

+int axp_set_sw(bool on) +{

• if (on)
• return pmic_bus_setbits(AXP803_OUTPUT_CTRL2,
• AXP803_OUTPUT_CTRL2_SW_EN);
• return pmic_bus_clrbits(AXP803_OUTPUT_CTRL2,
• AXP803_OUTPUT_CTRL2_SW_EN);

+}

+int axp_init(void) +{

• u8 axp_chip_id;
• int ret;
• ret = pmic_bus_init();
• if (ret)
• return ret;
• ret = pmic_bus_read(AXP803_CHIP_ID, &axp_chip_id);
• if (ret)
• return ret;
• if (!(axp_chip_id == 0x51))
• return -ENODEV;
• else
• return ret;
• return 0;

+}

+int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{

• pmic_bus_write(AXP803_SHUTDOWN, AXP803_SHUTDOWN_POWEROFF);
• /* infinite loop during shutdown */
• while (1) {}
• /* not reached */
• return 0;

+}

Is there any difference with the AXP818 driver?

FLDO3 is missing.

If that's the only reason, then it's not really needed to duplicate the whole code... Simply put the FLDO3 handling code in a return, or add a test using a if (IS_ENABLED()) ...

Thanks! Maxime