Hi,
On 3/18/22 01:10, Sebastian Krzyszkowiak wrote:
> Unlike other models, max17055 doesn't require cell characterization
> data and operates on smaller amount of input variables (DesignCap,
> VEmpty, IChgTerm and ModelCfg). Input data can already be filled in
> by max17042_override_por_values, however model refresh bit has to be
> set after adjusting input variables in order to make them apply.
>
> Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@xxxxxxx>
> ---
> drivers/power/supply/max17042_battery.c | 73 +++++++++++++++----------
> include/linux/power/max17042_battery.h | 3 +
> 2 files changed, 48 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
> index c019d6c52363..c39250349a1d 100644
> --- a/drivers/power/supply/max17042_battery.c
> +++ b/drivers/power/supply/max17042_battery.c
> @@ -806,6 +806,13 @@ static inline void max17042_override_por_values(struct max17042_chip *chip)
> (chip->chip_type == MAXIM_DEVICE_TYPE_MAX17055)) {
> max17042_override_por(map, MAX17047_V_empty, config->vempty);
> }
> +
> + if (chip->chip_type == MAXIM_DEVICE_TYPE_MAX17055) {
> + max17042_override_por(map, MAX17055_ModelCfg, config->model_cfg);
> + // VChg is 1 by default, so allow it to be set to 0
> + regmap_update_bits(map, MAX17055_ModelCfg,
> + MAX17055_MODELCFG_VCHG_BIT, config->model_cfg);
> + }
> }
>
> static int max17042_init_chip(struct max17042_chip *chip)
> @@ -814,44 +821,54 @@ static int max17042_init_chip(struct max17042_chip *chip)
> int ret;
>
> max17042_override_por_values(chip);
> +
> + if (chip->chip_type == MAXIM_DEVICE_TYPE_MAX17055) {
> + regmap_write_bits(map, MAX17055_ModelCfg,
> + MAX17055_MODELCFG_REFRESH_BIT, MAX17055_MODELCFG_REFRESH_BIT);
> + }
> +
This can be folded into the if (chip->chip_type == MAXIM_DEVICE_TYPE_MAX17055) {}
which you add to max17042_override_por_values() above.
> /* After Power up, the MAX17042 requires 500mS in order
> * to perform signal debouncing and initial SOC reporting
> */
> msleep(500);
>
> - /* Initialize configuration */
> - max17042_write_config_regs(chip);
> -
> - /* write cell characterization data */
> - ret = max17042_init_model(chip);
> - if (ret) {
> - dev_err(&chip->client->dev, "%s init failed\n",
> - __func__);
> - return -EIO;
> - }
> + if ((chip->chip_type == MAXIM_DEVICE_TYPE_MAX17042) ||
> + (chip->chip_type == MAXIM_DEVICE_TYPE_MAX17047) ||
> + (chip->chip_type == MAXIM_DEVICE_TYPE_MAX17050)) {
> + /* Initialize configuration */
> + max17042_write_config_regs(chip);
> +
> + /* write cell characterization data */
> + ret = max17042_init_model(chip);
> + if (ret) {
> + dev_err(&chip->client->dev, "%s init failed\n",
> + __func__);
> + return -EIO;
> + }
>
> - ret = max17042_verify_model_lock(chip);
> - if (ret) {
> - dev_err(&chip->client->dev, "%s lock verify failed\n",
> - __func__);
> - return -EIO;
> - }
> - /* write custom parameters */
> - max17042_write_custom_regs(chip);
> + ret = max17042_verify_model_lock(chip);
> + if (ret) {
> + dev_err(&chip->client->dev, "%s lock verify failed\n",
> + __func__);
> + return -EIO;
> + }
> + /* write custom parameters */
> + max17042_write_custom_regs(chip);
>
> - /* update capacity params */
> - max17042_update_capacity_regs(chip);
> + /* update capacity params */
> + max17042_update_capacity_regs(chip);
>
> - /* delay must be atleast 350mS to allow VFSOC
> - * to be calculated from the new configuration
> - */
> - msleep(350);
> + /* delay must be at least 350mS to allow VFSOC
> + * to be calculated from the new configuration
> + */
> + msleep(350);
>
> - /* reset vfsoc0 reg */
> - max17042_reset_vfsoc0_reg(chip);
> + /* reset vfsoc0 reg */
> + max17042_reset_vfsoc0_reg(chip);
>
> - /* load new capacity params */
> - max17042_load_new_capacity_params(chip);
> + /* load new capacity params */
> + max17042_load_new_capacity_params(chip);
> + }
>
> /* Init complete, Clear the POR bit */
> regmap_update_bits(map, MAX17042_STATUS, STATUS_POR_BIT, 0x0);
> diff --git a/include/linux/power/max17042_battery.h b/include/linux/power/max17042_battery.h
> index c417abd2ab70..6943921cab5e 100644
> --- a/include/linux/power/max17042_battery.h
> +++ b/include/linux/power/max17042_battery.h
> @@ -23,6 +23,8 @@
>
> #define MAX17042_CHARACTERIZATION_DATA_SIZE 48
>
> +#define MAX17055_MODELCFG_REFRESH_BIT BIT(15)
> +
> enum max17042_register {
> MAX17042_STATUS = 0x00,
> MAX17042_VALRT_Th = 0x01,
> @@ -208,6 +210,7 @@ struct max17042_config_data {
> u16 full_soc_thresh; /* 0x13 */
> u16 design_cap; /* 0x18 */
> u16 ichgt_term; /* 0x1E */
> + u16 model_cfg; /* 0xDB */
>
> /* MG3 config */
> u16 at_rate; /* 0x04 */
Regards,
Hans
