Commit 6455a8a8 authored by Iskren Chernev's avatar Iskren Chernev Committed by Sebastian Reichel

power: supply: max17040: Use regmap i2c

Rewrite i2c operations from i2c client read/write to regmap i2c. As
a result, most private functions now accept the private driver data
instead of an i2c client pointer.
Signed-off-by: default avatarIskren Chernev <iskren.chernev@gmail.com>
Tested-by: default avatarJonathan Bakker <xc-racer2@live.ca>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent e55a5061
...@@ -367,6 +367,7 @@ config AXP288_FUEL_GAUGE ...@@ -367,6 +367,7 @@ config AXP288_FUEL_GAUGE
config BATTERY_MAX17040 config BATTERY_MAX17040
tristate "Maxim MAX17040 Fuel Gauge" tristate "Maxim MAX17040 Fuel Gauge"
depends on I2C depends on I2C
select REGMAP_I2C
help help
MAX17040 is fuel-gauge systems for lithium-ion (Li+) batteries MAX17040 is fuel-gauge systems for lithium-ion (Li+) batteries
in handheld and portable equipment. The MAX17040 is configured in handheld and portable equipment. The MAX17040 is configured
......
...@@ -16,32 +16,30 @@ ...@@ -16,32 +16,30 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
#include <linux/max17040_battery.h> #include <linux/max17040_battery.h>
#include <linux/regmap.h>
#include <linux/slab.h> #include <linux/slab.h>
#define MAX17040_VCELL 0x02 #define MAX17040_VCELL 0x02
#define MAX17040_SOC 0x04 #define MAX17040_SOC 0x04
#define MAX17040_MODE 0x06 #define MAX17040_MODE 0x06
#define MAX17040_VER 0x08 #define MAX17040_VER 0x08
#define MAX17040_RCOMP 0x0C #define MAX17040_CONFIG 0x0C
#define MAX17040_CMD 0xFE #define MAX17040_CMD 0xFE
#define MAX17040_DELAY 1000 #define MAX17040_DELAY 1000
#define MAX17040_BATTERY_FULL 95 #define MAX17040_BATTERY_FULL 95
#define MAX17040_ATHD_MASK 0xFFC0 #define MAX17040_ATHD_MASK 0x3f
#define MAX17040_ATHD_DEFAULT_POWER_UP 4 #define MAX17040_ATHD_DEFAULT_POWER_UP 4
struct max17040_chip { struct max17040_chip {
struct i2c_client *client; struct i2c_client *client;
struct regmap *regmap;
struct delayed_work work; struct delayed_work work;
struct power_supply *battery; struct power_supply *battery;
struct max17040_platform_data *pdata; struct max17040_platform_data *pdata;
/* State Of Connect */
int online;
/* battery voltage */
int vcell;
/* battery capacity */ /* battery capacity */
int soc; int soc;
/* State Of Charge */ /* State Of Charge */
...@@ -50,138 +48,68 @@ struct max17040_chip { ...@@ -50,138 +48,68 @@ struct max17040_chip {
u32 low_soc_alert; u32 low_soc_alert;
}; };
static int max17040_get_property(struct power_supply *psy, static int max17040_reset(struct max17040_chip *chip)
enum power_supply_property psp,
union power_supply_propval *val)
{
struct max17040_chip *chip = power_supply_get_drvdata(psy);
switch (psp) {
case POWER_SUPPLY_PROP_STATUS:
val->intval = chip->status;
break;
case POWER_SUPPLY_PROP_ONLINE:
val->intval = chip->online;
break;
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
val->intval = chip->vcell;
break;
case POWER_SUPPLY_PROP_CAPACITY:
val->intval = chip->soc;
break;
case POWER_SUPPLY_PROP_CAPACITY_ALERT_MIN:
val->intval = chip->low_soc_alert;
break;
default:
return -EINVAL;
}
return 0;
}
static int max17040_write_reg(struct i2c_client *client, int reg, u16 value)
{ {
int ret; return regmap_write(chip->regmap, MAX17040_CMD, 0x0054);
ret = i2c_smbus_write_word_swapped(client, reg, value);
if (ret < 0)
dev_err(&client->dev, "%s: err %d\n", __func__, ret);
return ret;
}
static int max17040_read_reg(struct i2c_client *client, int reg)
{
int ret;
ret = i2c_smbus_read_word_swapped(client, reg);
if (ret < 0)
dev_err(&client->dev, "%s: err %d\n", __func__, ret);
return ret;
}
static void max17040_reset(struct i2c_client *client)
{
max17040_write_reg(client, MAX17040_CMD, 0x0054);
} }
static int max17040_set_low_soc_alert(struct i2c_client *client, u32 level) static int max17040_set_low_soc_alert(struct max17040_chip *chip, u32 level)
{ {
int ret;
u16 data;
level = 32 - level; level = 32 - level;
data = max17040_read_reg(client, MAX17040_RCOMP); return regmap_update_bits(chip->regmap, MAX17040_CONFIG,
/* clear the alrt bit and set LSb 5 bits */ MAX17040_ATHD_MASK, level);
data &= MAX17040_ATHD_MASK;
data |= level;
ret = max17040_write_reg(client, MAX17040_RCOMP, data);
return ret;
} }
static void max17040_get_vcell(struct i2c_client *client) static int max17040_get_vcell(struct max17040_chip *chip)
{ {
struct max17040_chip *chip = i2c_get_clientdata(client); u32 vcell;
u16 vcell;
vcell = max17040_read_reg(client, MAX17040_VCELL); regmap_read(chip->regmap, MAX17040_VCELL, &vcell);
chip->vcell = (vcell >> 4) * 1250; return (vcell >> 4) * 1250;
} }
static void max17040_get_soc(struct i2c_client *client) static int max17040_get_soc(struct max17040_chip *chip)
{ {
struct max17040_chip *chip = i2c_get_clientdata(client); u32 soc;
u16 soc;
soc = max17040_read_reg(client, MAX17040_SOC); regmap_read(chip->regmap, MAX17040_SOC, &soc);
chip->soc = (soc >> 8); return soc >> 8;
} }
static void max17040_get_version(struct i2c_client *client) static int max17040_get_version(struct max17040_chip *chip)
{ {
u16 version; int ret;
u32 version;
version = max17040_read_reg(client, MAX17040_VER); ret = regmap_read(chip->regmap, MAX17040_VER, &version);
dev_info(&client->dev, "MAX17040 Fuel-Gauge Ver 0x%x\n", version); return ret ? ret : version;
} }
static void max17040_get_online(struct i2c_client *client) static int max17040_get_online(struct max17040_chip *chip)
{ {
struct max17040_chip *chip = i2c_get_clientdata(client); return chip->pdata && chip->pdata->battery_online ?
chip->pdata->battery_online() : 1;
if (chip->pdata && chip->pdata->battery_online)
chip->online = chip->pdata->battery_online();
else
chip->online = 1;
} }
static void max17040_get_status(struct i2c_client *client) static int max17040_get_status(struct max17040_chip *chip)
{ {
struct max17040_chip *chip = i2c_get_clientdata(client);
if (!chip->pdata || !chip->pdata->charger_online if (!chip->pdata || !chip->pdata->charger_online
|| !chip->pdata->charger_enable) { || !chip->pdata->charger_enable)
chip->status = POWER_SUPPLY_STATUS_UNKNOWN; return POWER_SUPPLY_STATUS_UNKNOWN;
return;
} if (max17040_get_soc(chip) > MAX17040_BATTERY_FULL)
return POWER_SUPPLY_STATUS_FULL;
if (chip->pdata->charger_online()) { if (chip->pdata->charger_online())
if (chip->pdata->charger_enable()) if (chip->pdata->charger_enable())
chip->status = POWER_SUPPLY_STATUS_CHARGING; return POWER_SUPPLY_STATUS_CHARGING;
else else
chip->status = POWER_SUPPLY_STATUS_NOT_CHARGING; return POWER_SUPPLY_STATUS_NOT_CHARGING;
} else { else
chip->status = POWER_SUPPLY_STATUS_DISCHARGING; return POWER_SUPPLY_STATUS_DISCHARGING;
}
if (chip->soc > MAX17040_BATTERY_FULL)
chip->status = POWER_SUPPLY_STATUS_FULL;
} }
static int max17040_get_of_data(struct max17040_chip *chip) static int max17040_get_of_data(struct max17040_chip *chip)
...@@ -193,18 +121,18 @@ static int max17040_get_of_data(struct max17040_chip *chip) ...@@ -193,18 +121,18 @@ static int max17040_get_of_data(struct max17040_chip *chip)
"maxim,alert-low-soc-level", "maxim,alert-low-soc-level",
&chip->low_soc_alert); &chip->low_soc_alert);
if (chip->low_soc_alert <= 0 || chip->low_soc_alert >= 33) if (chip->low_soc_alert <= 0 || chip->low_soc_alert >= 33) {
dev_err(dev, "maxim,alert-low-soc-level out of bounds\n");
return -EINVAL; return -EINVAL;
}
return 0; return 0;
} }
static void max17040_check_changes(struct i2c_client *client) static void max17040_check_changes(struct max17040_chip *chip)
{ {
max17040_get_vcell(client); chip->soc = max17040_get_soc(chip);
max17040_get_soc(client); chip->status = max17040_get_status(chip);
max17040_get_online(client);
max17040_get_status(client);
} }
static void max17040_queue_work(struct max17040_chip *chip) static void max17040_queue_work(struct max17040_chip *chip)
...@@ -230,7 +158,7 @@ static void max17040_work(struct work_struct *work) ...@@ -230,7 +158,7 @@ static void max17040_work(struct work_struct *work)
/* store SOC and status to check changes */ /* store SOC and status to check changes */
last_soc = chip->soc; last_soc = chip->soc;
last_status = chip->status; last_status = chip->status;
max17040_check_changes(chip->client); max17040_check_changes(chip);
/* check changes and send uevent */ /* check changes and send uevent */
if (last_soc != chip->soc || last_status != chip->status) if (last_soc != chip->soc || last_status != chip->status)
...@@ -242,17 +170,17 @@ static void max17040_work(struct work_struct *work) ...@@ -242,17 +170,17 @@ static void max17040_work(struct work_struct *work)
static irqreturn_t max17040_thread_handler(int id, void *dev) static irqreturn_t max17040_thread_handler(int id, void *dev)
{ {
struct max17040_chip *chip = dev; struct max17040_chip *chip = dev;
struct i2c_client *client = chip->client;
dev_warn(&client->dev, "IRQ: Alert battery low level"); dev_warn(&chip->client->dev, "IRQ: Alert battery low level");
/* read registers */ /* read registers */
max17040_check_changes(chip->client); max17040_check_changes(chip);
/* send uevent */ /* send uevent */
power_supply_changed(chip->battery); power_supply_changed(chip->battery);
/* reset alert bit */ /* reset alert bit */
max17040_set_low_soc_alert(client, chip->low_soc_alert); max17040_set_low_soc_alert(chip, chip->low_soc_alert);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -296,7 +224,7 @@ static int max17040_set_property(struct power_supply *psy, ...@@ -296,7 +224,7 @@ static int max17040_set_property(struct power_supply *psy,
ret = -EINVAL; ret = -EINVAL;
break; break;
} }
ret = max17040_set_low_soc_alert(chip->client, val->intval); ret = max17040_set_low_soc_alert(chip, val->intval);
chip->low_soc_alert = val->intval; chip->low_soc_alert = val->intval;
break; break;
default: default:
...@@ -306,6 +234,41 @@ static int max17040_set_property(struct power_supply *psy, ...@@ -306,6 +234,41 @@ static int max17040_set_property(struct power_supply *psy,
return ret; return ret;
} }
static int max17040_get_property(struct power_supply *psy,
enum power_supply_property psp,
union power_supply_propval *val)
{
struct max17040_chip *chip = power_supply_get_drvdata(psy);
switch (psp) {
case POWER_SUPPLY_PROP_STATUS:
val->intval = max17040_get_status(chip);
break;
case POWER_SUPPLY_PROP_ONLINE:
val->intval = max17040_get_online(chip);
break;
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
val->intval = max17040_get_vcell(chip);
break;
case POWER_SUPPLY_PROP_CAPACITY:
val->intval = max17040_get_soc(chip);
break;
case POWER_SUPPLY_PROP_CAPACITY_ALERT_MIN:
val->intval = chip->low_soc_alert;
break;
default:
return -EINVAL;
}
return 0;
}
static const struct regmap_config max17040_regmap = {
.reg_bits = 8,
.reg_stride = 2,
.val_bits = 16,
.val_format_endian = REGMAP_ENDIAN_BIG,
};
static enum power_supply_property max17040_battery_props[] = { static enum power_supply_property max17040_battery_props[] = {
POWER_SUPPLY_PROP_STATUS, POWER_SUPPLY_PROP_STATUS,
POWER_SUPPLY_PROP_ONLINE, POWER_SUPPLY_PROP_ONLINE,
...@@ -340,13 +303,11 @@ static int max17040_probe(struct i2c_client *client, ...@@ -340,13 +303,11 @@ static int max17040_probe(struct i2c_client *client,
return -ENOMEM; return -ENOMEM;
chip->client = client; chip->client = client;
chip->regmap = devm_regmap_init_i2c(client, &max17040_regmap);
chip->pdata = client->dev.platform_data; chip->pdata = client->dev.platform_data;
ret = max17040_get_of_data(chip); ret = max17040_get_of_data(chip);
if (ret) { if (ret)
dev_err(&client->dev,
"failed: low SOC alert OF data out of bounds\n");
return ret; return ret;
}
i2c_set_clientdata(client, chip); i2c_set_clientdata(client, chip);
psy_cfg.drv_data = chip; psy_cfg.drv_data = chip;
...@@ -358,13 +319,17 @@ static int max17040_probe(struct i2c_client *client, ...@@ -358,13 +319,17 @@ static int max17040_probe(struct i2c_client *client,
return PTR_ERR(chip->battery); return PTR_ERR(chip->battery);
} }
max17040_reset(client); ret = max17040_get_version(chip);
max17040_get_version(client); if (ret < 0)
return ret;
dev_dbg(&chip->client->dev, "MAX17040 Fuel-Gauge Ver 0x%x\n", ret);
max17040_reset(chip);
/* check interrupt */ /* check interrupt */
if (client->irq && of_device_is_compatible(client->dev.of_node, if (client->irq && of_device_is_compatible(client->dev.of_node,
"maxim,max77836-battery")) { "maxim,max77836-battery")) {
ret = max17040_set_low_soc_alert(client, chip->low_soc_alert); ret = max17040_set_low_soc_alert(chip, chip->low_soc_alert);
if (ret) { if (ret) {
dev_err(&client->dev, dev_err(&client->dev,
"Failed to set low SOC alert: err %d\n", ret); "Failed to set low SOC alert: err %d\n", ret);
......
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