Skip to content

L
linux
Commit 39e7213e authored by Jonghwa Lee's avatar Jonghwa Lee Committed by Anton Vorontsov
Browse files
Options

max17042_battery: Support regmap to access device's registers 

This patch makes max17042 fuelguage driver uses regmap API to access its
device's registers.
Signed-off-by: default avatarJonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: default avatarMyungjoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: default avatarAnton Vorontsov <anton@enomsg.org>
parent 3d23c7f4
Show whitespace changes
Inline Side-by-side
Showing with 174 additions and 183 deletions
drivers/power/max17042_battery.c
View file @ 39e7213e
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/power_supply.h> #include <linux/power_supply.h>
#include <linux/power/max17042_battery.h> #include <linux/power/max17042_battery.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/regmap.h>
/* Status register bits */ /* Status register bits */
#define STATUS_POR_BIT (1 << 1) #define STATUS_POR_BIT (1 << 1)
...@@ -67,6 +68,7 @@ ...@@ -67,6 +68,7 @@
struct max17042_chip { struct max17042_chip {
struct i2c_client *client; struct i2c_client *client;
struct regmap *regmap;
struct power_supply battery; struct power_supply battery;
enum max170xx_chip_type chip_type; enum max170xx_chip_type chip_type;
struct max17042_platform_data *pdata; struct max17042_platform_data *pdata;
...@@ -74,35 +76,6 @@ struct max17042_chip { ...@@ -74,35 +76,6 @@ struct max17042_chip {
int init_complete; int init_complete;
}; };
static int max17042_write_reg(struct i2c_client *client, u8 reg, u16 value)
{
int ret = i2c_smbus_write_word_data(client, reg, value);
if (ret < 0)
dev_err(&client->dev, "%s: err %d\n", __func__, ret);
return ret;
}
static int max17042_read_reg(struct i2c_client *client, u8 reg)
{
int ret = i2c_smbus_read_word_data(client, reg);
if (ret < 0)
dev_err(&client->dev, "%s: err %d\n", __func__, ret);
return ret;
}
static void max17042_set_reg(struct i2c_client *client,
struct max17042_reg_data *data, int size)
{
int i;
for (i = 0; i < size; i++)
max17042_write_reg(client, data[i].addr, data[i].data);
}
static enum power_supply_property max17042_battery_props[] = { static enum power_supply_property max17042_battery_props[] = {
POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_PRESENT,
POWER_SUPPLY_PROP_CYCLE_COUNT, POWER_SUPPLY_PROP_CYCLE_COUNT,
...@@ -125,96 +98,98 @@ static int max17042_get_property(struct power_supply *psy, ...@@ -125,96 +98,98 @@ static int max17042_get_property(struct power_supply *psy,
{ {
struct max17042_chip *chip = container_of(psy, struct max17042_chip *chip = container_of(psy,
struct max17042_chip, battery); struct max17042_chip, battery);
struct regmap *map = chip->regmap;
int ret; int ret;
u32 data;
if (!chip->init_complete) if (!chip->init_complete)
return -EAGAIN; return -EAGAIN;
switch (psp) { switch (psp) {
case POWER_SUPPLY_PROP_PRESENT: case POWER_SUPPLY_PROP_PRESENT:
ret = max17042_read_reg(chip->client, MAX17042_STATUS); ret = regmap_read(map, MAX17042_STATUS, &data);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret & MAX17042_STATUS_BattAbsent) if (data & MAX17042_STATUS_BattAbsent)
val->intval = 0; val->intval = 0;
else else
val->intval = 1; val->intval = 1;
break; break;
case POWER_SUPPLY_PROP_CYCLE_COUNT: case POWER_SUPPLY_PROP_CYCLE_COUNT:
ret = max17042_read_reg(chip->client, MAX17042_Cycles); ret = regmap_read(map, MAX17042_Cycles, &data);
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = ret; val->intval = data;
break; break;
case POWER_SUPPLY_PROP_VOLTAGE_MAX: case POWER_SUPPLY_PROP_VOLTAGE_MAX:
ret = max17042_read_reg(chip->client, MAX17042_MinMaxVolt); ret = regmap_read(map, MAX17042_MinMaxVolt, &data);
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = ret >> 8; val->intval = data >> 8;
val->intval *= 20000; /* Units of LSB = 20mV */ val->intval *= 20000; /* Units of LSB = 20mV */
break; break;
case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN: case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
if (chip->chip_type == MAX17042) if (chip->chip_type == MAX17042)
ret = max17042_read_reg(chip->client, MAX17042_V_empty); ret = regmap_read(map, MAX17042_V_empty, &data);
else else
ret = max17042_read_reg(chip->client, MAX17047_V_empty); ret = regmap_read(map, MAX17047_V_empty, &data);
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = ret >> 7; val->intval = data >> 7;
val->intval *= 10000; /* Units of LSB = 10mV */ val->intval *= 10000; /* Units of LSB = 10mV */
break; break;
case POWER_SUPPLY_PROP_VOLTAGE_NOW: case POWER_SUPPLY_PROP_VOLTAGE_NOW:
ret = max17042_read_reg(chip->client, MAX17042_VCELL); ret = regmap_read(map, MAX17042_VCELL, &data);
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = ret * 625 / 8; val->intval = data * 625 / 8;
break; break;
case POWER_SUPPLY_PROP_VOLTAGE_AVG: case POWER_SUPPLY_PROP_VOLTAGE_AVG:
ret = max17042_read_reg(chip->client, MAX17042_AvgVCELL); ret = regmap_read(map, MAX17042_AvgVCELL, &data);
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = ret * 625 / 8; val->intval = data * 625 / 8;
break; break;
case POWER_SUPPLY_PROP_VOLTAGE_OCV: case POWER_SUPPLY_PROP_VOLTAGE_OCV:
ret = max17042_read_reg(chip->client, MAX17042_OCVInternal); ret = regmap_read(map, MAX17042_OCVInternal, &data);
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = ret * 625 / 8; val->intval = data * 625 / 8;
break; break;
case POWER_SUPPLY_PROP_CAPACITY: case POWER_SUPPLY_PROP_CAPACITY:
ret = max17042_read_reg(chip->client, MAX17042_RepSOC); ret = regmap_read(map, MAX17042_RepSOC, &data);
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = ret >> 8; val->intval = data >> 8;
break; break;
case POWER_SUPPLY_PROP_CHARGE_FULL: case POWER_SUPPLY_PROP_CHARGE_FULL:
ret = max17042_read_reg(chip->client, MAX17042_FullCAP); ret = regmap_read(map, MAX17042_FullCAP, &data);
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = ret * 1000 / 2; val->intval = data * 1000 / 2;
break; break;
case POWER_SUPPLY_PROP_CHARGE_COUNTER: case POWER_SUPPLY_PROP_CHARGE_COUNTER:
ret = max17042_read_reg(chip->client, MAX17042_QH); ret = regmap_read(map, MAX17042_QH, &data);
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = ret * 1000 / 2; val->intval = data * 1000 / 2;
break; break;
case POWER_SUPPLY_PROP_TEMP: case POWER_SUPPLY_PROP_TEMP:
ret = max17042_read_reg(chip->client, MAX17042_TEMP); ret = regmap_read(map, MAX17042_TEMP, &data);
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = ret; val->intval = data;
/* The value is signed. */ /* The value is signed. */
if (val->intval & 0x8000) { if (val->intval & 0x8000) {
val->intval = (0x7fff & ~val->intval) + 1; val->intval = (0x7fff & ~val->intval) + 1;
...@@ -226,11 +201,11 @@ static int max17042_get_property(struct power_supply *psy, ...@@ -226,11 +201,11 @@ static int max17042_get_property(struct power_supply *psy,
break; break;
case POWER_SUPPLY_PROP_CURRENT_NOW: case POWER_SUPPLY_PROP_CURRENT_NOW:
if (chip->pdata->enable_current_sense) { if (chip->pdata->enable_current_sense) {
ret = max17042_read_reg(chip->client, MAX17042_Current); ret = regmap_read(map, MAX17042_Current, &data);
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = ret; val->intval = data;
if (val->intval & 0x8000) { if (val->intval & 0x8000) {
/* Negative */ /* Negative */
val->intval = ~val->intval & 0x7fff; val->intval = ~val->intval & 0x7fff;
...@@ -244,12 +219,11 @@ static int max17042_get_property(struct power_supply *psy, ...@@ -244,12 +219,11 @@ static int max17042_get_property(struct power_supply *psy,
break; break;
case POWER_SUPPLY_PROP_CURRENT_AVG: case POWER_SUPPLY_PROP_CURRENT_AVG:
if (chip->pdata->enable_current_sense) { if (chip->pdata->enable_current_sense) {
ret = max17042_read_reg(chip->client, ret = regmap_read(map, MAX17042_AvgCurrent, &data);
MAX17042_AvgCurrent);
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = ret; val->intval = data;
if (val->intval & 0x8000) { if (val->intval & 0x8000) {
/* Negative */ /* Negative */
val->intval = ~val->intval & 0x7fff; val->intval = ~val->intval & 0x7fff;
...@@ -267,16 +241,15 @@ static int max17042_get_property(struct power_supply *psy, ...@@ -267,16 +241,15 @@ static int max17042_get_property(struct power_supply *psy,
return 0; return 0;
} }
static int max17042_write_verify_reg(struct i2c_client *client, static int max17042_write_verify_reg(struct regmap *map, u8 reg, u32 value)
u8 reg, u16 value)
{ {
int retries = 8; int retries = 8;
int ret; int ret;
u16 read_value; u32 read_value;
do { do {
ret = i2c_smbus_write_word_data(client, reg, value); ret = regmap_write(map, reg, value);
read_value = max17042_read_reg(client, reg); regmap_read(map, reg, &read_value);
if (read_value != value) { if (read_value != value) {
ret = -EIO; ret = -EIO;
retries--; retries--;
...@@ -284,50 +257,51 @@ static int max17042_write_verify_reg(struct i2c_client *client, ...@@ -284,50 +257,51 @@ static int max17042_write_verify_reg(struct i2c_client *client,
} while (retries && read_value != value); } while (retries && read_value != value);
if (ret < 0) if (ret < 0)
dev_err(&client->dev, "%s: err %d\n", __func__, ret); pr_err("%s: err %d\n", __func__, ret);
return ret; return ret;
} }
static inline void max17042_override_por( static inline void max17042_override_por(struct regmap *map,
struct i2c_client *client, u8 reg, u16 value) u8 reg, u16 value)
{ {
if (value) if (value)
max17042_write_reg(client, reg, value); regmap_write(map, reg, value);
} }
static inline void max10742_unlock_model(struct max17042_chip *chip) static inline void max10742_unlock_model(struct max17042_chip *chip)
{ {
struct i2c_client *client = chip->client; struct regmap *map = chip->regmap;
max17042_write_reg(client, MAX17042_MLOCKReg1, MODEL_UNLOCK1); regmap_write(map, MAX17042_MLOCKReg1, MODEL_UNLOCK1);
max17042_write_reg(client, MAX17042_MLOCKReg2, MODEL_UNLOCK2); regmap_write(map, MAX17042_MLOCKReg2, MODEL_UNLOCK2);
} }
static inline void max10742_lock_model(struct max17042_chip *chip) static inline void max10742_lock_model(struct max17042_chip *chip)
{ {
struct i2c_client *client = chip->client; struct regmap *map = chip->regmap;
max17042_write_reg(client, MAX17042_MLOCKReg1, MODEL_LOCK1);
max17042_write_reg(client, MAX17042_MLOCKReg2, MODEL_LOCK2); regmap_write(map, MAX17042_MLOCKReg1, MODEL_LOCK1);
regmap_write(map, MAX17042_MLOCKReg2, MODEL_LOCK2);
} }
static inline void max17042_write_model_data(struct max17042_chip *chip, static inline void max17042_write_model_data(struct max17042_chip *chip,
u8 addr, int size) u8 addr, int size)
{ {
struct i2c_client *client = chip->client; struct regmap *map = chip->regmap;
int i; int i;
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
max17042_write_reg(client, addr + i, regmap_write(map, addr + i,
chip->pdata->config_data->cell_char_tbl[i]); chip->pdata->config_data->cell_char_tbl[i]);
} }
static inline void max17042_read_model_data(struct max17042_chip *chip, static inline void max17042_read_model_data(struct max17042_chip *chip,
u8 addr, u16 *data, int size) u8 addr, u32 *data, int size)
{ {
struct i2c_client *client = chip->client; struct regmap *map = chip->regmap;
int i; int i;
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
data[i] = max17042_read_reg(client, addr + i); regmap_read(map, addr + i, &data[i]);
} }
static inline int max17042_model_data_compare(struct max17042_chip *chip, static inline int max17042_model_data_compare(struct max17042_chip *chip,
...@@ -350,7 +324,7 @@ static int max17042_init_model(struct max17042_chip *chip) ...@@ -350,7 +324,7 @@ static int max17042_init_model(struct max17042_chip *chip)
{ {
int ret; int ret;
int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl); int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl);
u16 *temp_data; u32 *temp_data;
temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL); temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL);
if (!temp_data) if (!temp_data)
...@@ -365,7 +339,7 @@ static int max17042_init_model(struct max17042_chip *chip) ...@@ -365,7 +339,7 @@ static int max17042_init_model(struct max17042_chip *chip)
ret = max17042_model_data_compare( ret = max17042_model_data_compare(
chip, chip,
chip->pdata->config_data->cell_char_tbl, chip->pdata->config_data->cell_char_tbl,
temp_data, (u16 *)temp_data,
table_size); table_size);
max10742_lock_model(chip); max10742_lock_model(chip);
...@@ -378,7 +352,7 @@ static int max17042_verify_model_lock(struct max17042_chip *chip) ...@@ -378,7 +352,7 @@ static int max17042_verify_model_lock(struct max17042_chip *chip)
{ {
int i; int i;
int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl); int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl);
u16 *temp_data; u32 *temp_data;
int ret = 0; int ret = 0;
temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL); temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL);
...@@ -398,40 +372,38 @@ static int max17042_verify_model_lock(struct max17042_chip *chip) ...@@ -398,40 +372,38 @@ static int max17042_verify_model_lock(struct max17042_chip *chip)
static void max17042_write_config_regs(struct max17042_chip *chip) static void max17042_write_config_regs(struct max17042_chip *chip)
{ {
struct max17042_config_data *config = chip->pdata->config_data; struct max17042_config_data *config = chip->pdata->config_data;
struct regmap *map = chip->regmap;
max17042_write_reg(chip->client, MAX17042_CONFIG, config->config); regmap_write(map, MAX17042_CONFIG, config->config);
max17042_write_reg(chip->client, MAX17042_LearnCFG, config->learn_cfg); regmap_write(map, MAX17042_LearnCFG, config->learn_cfg);
max17042_write_reg(chip->client, MAX17042_FilterCFG, regmap_write(map, MAX17042_FilterCFG,
config->filter_cfg); config->filter_cfg);
max17042_write_reg(chip->client, MAX17042_RelaxCFG, config->relax_cfg); regmap_write(map, MAX17042_RelaxCFG, config->relax_cfg);
if (chip->chip_type == MAX17047) if (chip->chip_type == MAX17047)
max17042_write_reg(chip->client, MAX17047_FullSOCThr, regmap_write(map, MAX17047_FullSOCThr,
config->full_soc_thresh); config->full_soc_thresh);
} }
static void max17042_write_custom_regs(struct max17042_chip *chip) static void max17042_write_custom_regs(struct max17042_chip *chip)
{ {
struct max17042_config_data *config = chip->pdata->config_data; struct max17042_config_data *config = chip->pdata->config_data;
struct regmap *map = chip->regmap;
max17042_write_verify_reg(chip->client, MAX17042_RCOMP0, max17042_write_verify_reg(map, MAX17042_RCOMP0, config->rcomp0);
config->rcomp0); max17042_write_verify_reg(map, MAX17042_TempCo, config->tcompc0);
max17042_write_verify_reg(chip->client, MAX17042_TempCo, max17042_write_verify_reg(map, MAX17042_ICHGTerm, config->ichgt_term);
config->tcompc0);
max17042_write_verify_reg(chip->client, MAX17042_ICHGTerm,
config->ichgt_term);
if (chip->chip_type == MAX17042) { if (chip->chip_type == MAX17042) {
max17042_write_reg(chip->client, MAX17042_EmptyTempCo, regmap_write(map, MAX17042_EmptyTempCo, config->empty_tempco);
config->empty_tempco); max17042_write_verify_reg(map, MAX17042_K_empty0,
max17042_write_verify_reg(chip->client, MAX17042_K_empty0,
config->kempty0); config->kempty0);
} else { } else {
max17042_write_verify_reg(chip->client, MAX17047_QRTbl00, max17042_write_verify_reg(map, MAX17047_QRTbl00,
config->qrtbl00); config->qrtbl00);
max17042_write_verify_reg(chip->client, MAX17047_QRTbl10, max17042_write_verify_reg(map, MAX17047_QRTbl10,
config->qrtbl10); config->qrtbl10);
max17042_write_verify_reg(chip->client, MAX17047_QRTbl20, max17042_write_verify_reg(map, MAX17047_QRTbl20,
config->qrtbl20); config->qrtbl20);
max17042_write_verify_reg(chip->client, MAX17047_QRTbl30, max17042_write_verify_reg(map, MAX17047_QRTbl30,
config->qrtbl30); config->qrtbl30);
} }
} }
...@@ -439,58 +411,60 @@ static void max17042_write_custom_regs(struct max17042_chip *chip) ...@@ -439,58 +411,60 @@ static void max17042_write_custom_regs(struct max17042_chip *chip)
static void max17042_update_capacity_regs(struct max17042_chip *chip) static void max17042_update_capacity_regs(struct max17042_chip *chip)
{ {
struct max17042_config_data *config = chip->pdata->config_data; struct max17042_config_data *config = chip->pdata->config_data;
struct regmap *map = chip->regmap;
max17042_write_verify_reg(chip->client, MAX17042_FullCAP, max17042_write_verify_reg(map, MAX17042_FullCAP,
config->fullcap); config->fullcap);
max17042_write_reg(chip->client, MAX17042_DesignCap, regmap_write(map, MAX17042_DesignCap, config->design_cap);
config->design_cap); max17042_write_verify_reg(map, MAX17042_FullCAPNom,
max17042_write_verify_reg(chip->client, MAX17042_FullCAPNom,
config->fullcapnom); config->fullcapnom);
} }
static void max17042_reset_vfsoc0_reg(struct max17042_chip *chip) static void max17042_reset_vfsoc0_reg(struct max17042_chip *chip)
{ {
u16 vfSoc; unsigned int vfSoc;
struct regmap *map = chip->regmap;
vfSoc = max17042_read_reg(chip->client, MAX17042_VFSOC); regmap_read(map, MAX17042_VFSOC, &vfSoc);
max17042_write_reg(chip->client, MAX17042_VFSOC0Enable, VFSOC0_UNLOCK); regmap_write(map, MAX17042_VFSOC0Enable, VFSOC0_UNLOCK);
max17042_write_verify_reg(chip->client, MAX17042_VFSOC0, vfSoc); max17042_write_verify_reg(map, MAX17042_VFSOC0, vfSoc);
max17042_write_reg(chip->client, MAX17042_VFSOC0Enable, VFSOC0_LOCK); regmap_write(map, MAX17042_VFSOC0Enable, VFSOC0_LOCK);
} }
static void max17042_load_new_capacity_params(struct max17042_chip *chip) static void max17042_load_new_capacity_params(struct max17042_chip *chip)
{ {
u16 full_cap0, rep_cap, dq_acc, vfSoc; u32 full_cap0, rep_cap, dq_acc, vfSoc;
u32 rem_cap; u32 rem_cap;
struct max17042_config_data *config = chip->pdata->config_data; struct max17042_config_data *config = chip->pdata->config_data;
struct regmap *map = chip->regmap;
full_cap0 = max17042_read_reg(chip->client, MAX17042_FullCAP0); regmap_read(map, MAX17042_FullCAP0, &full_cap0);
vfSoc = max17042_read_reg(chip->client, MAX17042_VFSOC); regmap_read(map, MAX17042_VFSOC, &vfSoc);
/* fg_vfSoc needs to shifted by 8 bits to get the /* fg_vfSoc needs to shifted by 8 bits to get the
* perc in 1% accuracy, to get the right rem_cap multiply * perc in 1% accuracy, to get the right rem_cap multiply
* full_cap0, fg_vfSoc and devide by 100 * full_cap0, fg_vfSoc and devide by 100
*/ */
rem_cap = ((vfSoc >> 8) * full_cap0) / 100; rem_cap = ((vfSoc >> 8) * full_cap0) / 100;
max17042_write_verify_reg(chip->client, MAX17042_RemCap, (u16)rem_cap); max17042_write_verify_reg(map, MAX17042_RemCap, rem_cap);
rep_cap = (u16)rem_cap; rep_cap = rem_cap;
max17042_write_verify_reg(chip->client, MAX17042_RepCap, rep_cap); max17042_write_verify_reg(map, MAX17042_RepCap, rep_cap);
/* Write dQ_acc to 200% of Capacity and dP_acc to 200% */ /* Write dQ_acc to 200% of Capacity and dP_acc to 200% */
dq_acc = config->fullcap / dQ_ACC_DIV; dq_acc = config->fullcap / dQ_ACC_DIV;
max17042_write_verify_reg(chip->client, MAX17042_dQacc, dq_acc); max17042_write_verify_reg(map, MAX17042_dQacc, dq_acc);
max17042_write_verify_reg(chip->client, MAX17042_dPacc, dP_ACC_200); max17042_write_verify_reg(map, MAX17042_dPacc, dP_ACC_200);
max17042_write_verify_reg(chip->client, MAX17042_FullCAP, max17042_write_verify_reg(map, MAX17042_FullCAP,
config->fullcap); config->fullcap);
max17042_write_reg(chip->client, MAX17042_DesignCap, regmap_write(map, MAX17042_DesignCap,
config->design_cap); config->design_cap);
max17042_write_verify_reg(chip->client, MAX17042_FullCAPNom, max17042_write_verify_reg(map, MAX17042_FullCAPNom,
config->fullcapnom); config->fullcapnom);
/* Update SOC register with new SOC */ /* Update SOC register with new SOC */
max17042_write_reg(chip->client, MAX17042_RepSOC, vfSoc); regmap_write(map, MAX17042_RepSOC, vfSoc);
} }
/* /*
...@@ -500,59 +474,60 @@ static void max17042_load_new_capacity_params(struct max17042_chip *chip) ...@@ -500,59 +474,60 @@ static void max17042_load_new_capacity_params(struct max17042_chip *chip)
*/ */
static inline void max17042_override_por_values(struct max17042_chip *chip) static inline void max17042_override_por_values(struct max17042_chip *chip)
{ {
struct i2c_client *client = chip->client; struct regmap *map = chip->regmap;
struct max17042_config_data *config = chip->pdata->config_data; struct max17042_config_data *config = chip->pdata->config_data;
max17042_override_por(client, MAX17042_TGAIN, config->tgain); max17042_override_por(map, MAX17042_TGAIN, config->tgain);
max17042_override_por(client, MAx17042_TOFF, config->toff); max17042_override_por(map, MAx17042_TOFF, config->toff);
max17042_override_por(client, MAX17042_CGAIN, config->cgain); max17042_override_por(map, MAX17042_CGAIN, config->cgain);
max17042_override_por(client, MAX17042_COFF, config->coff); max17042_override_por(map, MAX17042_COFF, config->coff);
max17042_override_por(client, MAX17042_VALRT_Th, config->valrt_thresh); max17042_override_por(map, MAX17042_VALRT_Th, config->valrt_thresh);
max17042_override_por(client, MAX17042_TALRT_Th, config->talrt_thresh); max17042_override_por(map, MAX17042_TALRT_Th, config->talrt_thresh);
max17042_override_por(client, MAX17042_SALRT_Th, max17042_override_por(map, MAX17042_SALRT_Th,
config->soc_alrt_thresh); config->soc_alrt_thresh);
max17042_override_por(client, MAX17042_CONFIG, config->config); max17042_override_por(map, MAX17042_CONFIG, config->config);
max17042_override_por(client, MAX17042_SHDNTIMER, config->shdntimer); max17042_override_por(map, MAX17042_SHDNTIMER, config->shdntimer);
max17042_override_por(client, MAX17042_DesignCap, config->design_cap); max17042_override_por(map, MAX17042_DesignCap, config->design_cap);
max17042_override_por(client, MAX17042_ICHGTerm, config->ichgt_term); max17042_override_por(map, MAX17042_ICHGTerm, config->ichgt_term);
max17042_override_por(client, MAX17042_AtRate, config->at_rate); max17042_override_por(map, MAX17042_AtRate, config->at_rate);
max17042_override_por(client, MAX17042_LearnCFG, config->learn_cfg); max17042_override_por(map, MAX17042_LearnCFG, config->learn_cfg);
max17042_override_por(client, MAX17042_FilterCFG, config->filter_cfg); max17042_override_por(map, MAX17042_FilterCFG, config->filter_cfg);
max17042_override_por(client, MAX17042_RelaxCFG, config->relax_cfg); max17042_override_por(map, MAX17042_RelaxCFG, config->relax_cfg);
max17042_override_por(client, MAX17042_MiscCFG, config->misc_cfg); max17042_override_por(map, MAX17042_MiscCFG, config->misc_cfg);
max17042_override_por(client, MAX17042_MaskSOC, config->masksoc); max17042_override_por(map, MAX17042_MaskSOC, config->masksoc);
max17042_override_por(client, MAX17042_FullCAP, config->fullcap); max17042_override_por(map, MAX17042_FullCAP, config->fullcap);
max17042_override_por(client, MAX17042_FullCAPNom, config->fullcapnom); max17042_override_por(map, MAX17042_FullCAPNom, config->fullcapnom);
if (chip->chip_type == MAX17042) if (chip->chip_type == MAX17042)
max17042_override_por(client, MAX17042_SOC_empty, max17042_override_por(map, MAX17042_SOC_empty,
config->socempty); config->socempty);
max17042_override_por(client, MAX17042_LAvg_empty, config->lavg_empty); max17042_override_por(map, MAX17042_LAvg_empty, config->lavg_empty);
max17042_override_por(client, MAX17042_dQacc, config->dqacc); max17042_override_por(map, MAX17042_dQacc, config->dqacc);
max17042_override_por(client, MAX17042_dPacc, config->dpacc); max17042_override_por(map, MAX17042_dPacc, config->dpacc);
if (chip->chip_type == MAX17042) if (chip->chip_type == MAX17042)
max17042_override_por(client, MAX17042_V_empty, config->vempty); max17042_override_por(map, MAX17042_V_empty, config->vempty);
else else
max17042_override_por(client, MAX17047_V_empty, config->vempty); max17042_override_por(map, MAX17047_V_empty, config->vempty);
max17042_override_por(client, MAX17042_TempNom, config->temp_nom); max17042_override_por(map, MAX17042_TempNom, config->temp_nom);
max17042_override_por(client, MAX17042_TempLim, config->temp_lim); max17042_override_por(map, MAX17042_TempLim, config->temp_lim);
max17042_override_por(client, MAX17042_FCTC, config->fctc); max17042_override_por(map, MAX17042_FCTC, config->fctc);
max17042_override_por(client, MAX17042_RCOMP0, config->rcomp0); max17042_override_por(map, MAX17042_RCOMP0, config->rcomp0);
max17042_override_por(client, MAX17042_TempCo, config->tcompc0); max17042_override_por(map, MAX17042_TempCo, config->tcompc0);
if (chip->chip_type) { if (chip->chip_type) {
max17042_override_por(client, MAX17042_EmptyTempCo, max17042_override_por(map, MAX17042_EmptyTempCo,
config->empty_tempco); config->empty_tempco);
max17042_override_por(client, MAX17042_K_empty0, max17042_override_por(map, MAX17042_K_empty0,
config->kempty0); config->kempty0);
} }
} }
static int max17042_init_chip(struct max17042_chip *chip) static int max17042_init_chip(struct max17042_chip *chip)
{ {
struct regmap *map = chip->regmap;
int ret; int ret;
int val; int val;
...@@ -597,31 +572,32 @@ static int max17042_init_chip(struct max17042_chip *chip) ...@@ -597,31 +572,32 @@ static int max17042_init_chip(struct max17042_chip *chip)
max17042_load_new_capacity_params(chip); max17042_load_new_capacity_params(chip);
/* Init complete, Clear the POR bit */ /* Init complete, Clear the POR bit */
val = max17042_read_reg(chip->client, MAX17042_STATUS); regmap_read(map, MAX17042_STATUS, &val);
max17042_write_reg(chip->client, MAX17042_STATUS, regmap_write(map, MAX17042_STATUS, val & (~STATUS_POR_BIT));
val & (~STATUS_POR_BIT));
return 0; return 0;
} }
static void max17042_set_soc_threshold(struct max17042_chip *chip, u16 off) static void max17042_set_soc_threshold(struct max17042_chip *chip, u16 off)
{ {
u16 soc, soc_tr; struct regmap *map = chip->regmap;
u32 soc, soc_tr;
/* program interrupt thesholds such that we should /* program interrupt thesholds such that we should
* get interrupt for every 'off' perc change in the soc * get interrupt for every 'off' perc change in the soc
*/ */
soc = max17042_read_reg(chip->client, MAX17042_RepSOC) >> 8; regmap_read(map, MAX17042_RepSOC, &soc);
soc >>= 8;
soc_tr = (soc + off) << 8; soc_tr = (soc + off) << 8;
soc_tr |= (soc - off); soc_tr |= (soc - off);
max17042_write_reg(chip->client, MAX17042_SALRT_Th, soc_tr); regmap_write(map, MAX17042_SALRT_Th, soc_tr);
} }
static irqreturn_t max17042_thread_handler(int id, void *dev) static irqreturn_t max17042_thread_handler(int id, void *dev)
{ {
struct max17042_chip *chip = dev; struct max17042_chip *chip = dev;
u16 val; u32 val;
val = max17042_read_reg(chip->client, MAX17042_STATUS); regmap_read(chip->regmap, MAX17042_STATUS, &val);
if ((val & STATUS_INTR_SOCMIN_BIT) || if ((val & STATUS_INTR_SOCMIN_BIT) ||
(val & STATUS_INTR_SOCMAX_BIT)) { (val & STATUS_INTR_SOCMAX_BIT)) {
dev_info(&chip->client->dev, "SOC threshold INTR\n"); dev_info(&chip->client->dev, "SOC threshold INTR\n");
...@@ -682,13 +658,20 @@ max17042_get_pdata(struct device *dev) ...@@ -682,13 +658,20 @@ max17042_get_pdata(struct device *dev)
} }
#endif #endif
static struct regmap_config max17042_regmap_config = {
.reg_bits = 8,
.val_bits = 16,
.val_format_endian = REGMAP_ENDIAN_NATIVE,
};
static int max17042_probe(struct i2c_client *client, static int max17042_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
struct max17042_chip *chip; struct max17042_chip *chip;
int ret; int ret;
int reg; int i;
u32 val;
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA))
return -EIO; return -EIO;
...@@ -698,6 +681,12 @@ static int max17042_probe(struct i2c_client *client, ...@@ -698,6 +681,12 @@ static int max17042_probe(struct i2c_client *client,
return -ENOMEM; return -ENOMEM;
chip->client = client; chip->client = client;
chip->regmap = devm_regmap_init_i2c(client, &max17042_regmap_config);
if (IS_ERR(chip->regmap)) {
dev_err(&client->dev, "Failed to initialize regmap\n");
return -EINVAL;
}
chip->pdata = max17042_get_pdata(&client->dev); chip->pdata = max17042_get_pdata(&client->dev);
if (!chip->pdata) { if (!chip->pdata) {
dev_err(&client->dev, "no platform data provided\n"); dev_err(&client->dev, "no platform data provided\n");
...@@ -706,15 +695,15 @@ static int max17042_probe(struct i2c_client *client, ...@@ -706,15 +695,15 @@ static int max17042_probe(struct i2c_client *client,
i2c_set_clientdata(client, chip); i2c_set_clientdata(client, chip);
ret = max17042_read_reg(chip->client, MAX17042_DevName); regmap_read(chip->regmap, MAX17042_DevName, &val);
if (ret == MAX17042_IC_VERSION) { if (val == MAX17042_IC_VERSION) {
dev_dbg(&client->dev, "chip type max17042 detected\n"); dev_dbg(&client->dev, "chip type max17042 detected\n");
chip->chip_type = MAX17042; chip->chip_type = MAX17042;
} else if (ret == MAX17047_IC_VERSION) { } else if (val == MAX17047_IC_VERSION) {
dev_dbg(&client->dev, "chip type max17047/50 detected\n"); dev_dbg(&client->dev, "chip type max17047/50 detected\n");
chip->chip_type = MAX17047; chip->chip_type = MAX17047;
} else { } else {
dev_err(&client->dev, "device version mismatch: %x\n", ret); dev_err(&client->dev, "device version mismatch: %x\n", val);
return -EIO; return -EIO;
} }
...@@ -733,13 +722,15 @@ static int max17042_probe(struct i2c_client *client, ...@@ -733,13 +722,15 @@ static int max17042_probe(struct i2c_client *client,
chip->pdata->r_sns = MAX17042_DEFAULT_SNS_RESISTOR; chip->pdata->r_sns = MAX17042_DEFAULT_SNS_RESISTOR;
if (chip->pdata->init_data) if (chip->pdata->init_data)
max17042_set_reg(client, chip->pdata->init_data, for (i = 0; i < chip->pdata->num_init_data; i++)
chip->pdata->num_init_data); regmap_write(chip->regmap,
chip->pdata->init_data[i].addr,
chip->pdata->init_data[i].data);
if (!chip->pdata->enable_current_sense) { if (!chip->pdata->enable_current_sense) {
max17042_write_reg(client, MAX17042_CGAIN, 0x0000); regmap_write(chip->regmap, MAX17042_CGAIN, 0x0000);
max17042_write_reg(client, MAX17042_MiscCFG, 0x0003); regmap_write(chip->regmap, MAX17042_MiscCFG, 0x0003);
max17042_write_reg(client, MAX17042_LearnCFG, 0x0007); regmap_write(chip->regmap, MAX17042_LearnCFG, 0x0007);
} }
ret = power_supply_register(&client->dev, &chip->battery); ret = power_supply_register(&client->dev, &chip->battery);
...@@ -754,9 +745,9 @@ static int max17042_probe(struct i2c_client *client, ...@@ -754,9 +745,9 @@ static int max17042_probe(struct i2c_client *client,
IRQF_TRIGGER_FALLING, IRQF_TRIGGER_FALLING,
chip->battery.name, chip); chip->battery.name, chip);
if (!ret) { if (!ret) {
reg = max17042_read_reg(client, MAX17042_CONFIG); regmap_read(chip->regmap, MAX17042_CONFIG, &val);
reg |= CONFIG_ALRT_BIT_ENBL; val |= CONFIG_ALRT_BIT_ENBL;
max17042_write_reg(client, MAX17042_CONFIG, reg); regmap_write(chip->regmap, MAX17042_CONFIG, val);
max17042_set_soc_threshold(chip, 1); max17042_set_soc_threshold(chip, 1);
} else { } else {
client->irq = 0; client->irq = 0;
...@@ -765,8 +756,8 @@ static int max17042_probe(struct i2c_client *client, ...@@ -765,8 +756,8 @@ static int max17042_probe(struct i2c_client *client,
} }
} }
reg = max17042_read_reg(chip->client, MAX17042_STATUS); regmap_read(chip->regmap, MAX17042_STATUS, &val);
if (reg & STATUS_POR_BIT) { if (val & STATUS_POR_BIT) {
INIT_WORK(&chip->work, max17042_init_worker); INIT_WORK(&chip->work, max17042_init_worker);
schedule_work(&chip->work); schedule_work(&chip->work);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7