This patch adds support for BQ27425 (TI) chip. This
chip is same as BQ27500 with few registers removed
and register address map changed. The data sheet for
this chip is publicly available at
http://www.ti.com/product/bq27425-g1
Changes since v1:
Remove the additional Kconfig entry
Add a second power_supply_property array for bq27425
and assign the appropriate array at run-time based
on battery type.
Signed-off-by: Saranya Gopal <[email protected]>
---
drivers/power/bq27x00_battery.c | 99 +++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 20 deletions(-)
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index f5d6d37..58775ea 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -22,6 +22,7 @@
* Datasheets:
* http://focus.ti.com/docs/prod/folders/print/bq27000.html
* http://focus.ti.com/docs/prod/folders/print/bq27500.html
+ * http://www.ti.com/product/bq27425-g1
*/
#include <linux/module.h>
@@ -67,6 +68,14 @@
#define BQ27500_FLAG_SOC1 BIT(2) /* State-of-Charge threshold 1 */
#define BQ27500_FLAG_FC BIT(9)
+#define BQ27425_REG_TEMP 0x02
+#define BQ27425_REG_VOLT 0x04
+#define BQ27425_REG_FLAGS 0x06
+#define BQ27425_REG_NAC 0x08
+#define BQ27425_REG_FCC 0x0E
+#define BQ27425_REG_AI 0x10
+#define BQ27425_REG_SOC 0x1C
+
#define BQ27000_RS 20 /* Resistor sense */
struct bq27x00_device_info;
@@ -74,7 +83,7 @@ struct bq27x00_access_methods {
int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
};
-enum bq27x00_chip { BQ27000, BQ27500 };
+enum bq27x00_chip { BQ27000, BQ27500, BQ27425};
struct bq27x00_reg_cache {
int temperature;
@@ -125,6 +134,20 @@ static enum power_supply_property bq27x00_battery_props[] = {
POWER_SUPPLY_PROP_ENERGY_NOW,
};
+static enum power_supply_property bq27425_battery_props[] = {
+ POWER_SUPPLY_PROP_STATUS,
+ POWER_SUPPLY_PROP_PRESENT,
+ POWER_SUPPLY_PROP_VOLTAGE_NOW,
+ POWER_SUPPLY_PROP_CURRENT_NOW,
+ POWER_SUPPLY_PROP_CAPACITY,
+ POWER_SUPPLY_PROP_CAPACITY_LEVEL,
+ POWER_SUPPLY_PROP_TEMP,
+ POWER_SUPPLY_PROP_TECHNOLOGY,
+ POWER_SUPPLY_PROP_CHARGE_FULL,
+ POWER_SUPPLY_PROP_CHARGE_NOW,
+ POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
+};
+
static unsigned int poll_interval = 360;
module_param(poll_interval, uint, 0644);
MODULE_PARM_DESC(poll_interval, "battery poll interval in seconds - " \
@@ -150,6 +173,8 @@ static int bq27x00_battery_read_rsoc(struct bq27x00_device_info *di)
if (di->chip == BQ27500)
rsoc = bq27x00_read(di, BQ27500_REG_SOC, false);
+ else if (di->chip == BQ27425)
+ rsoc = bq27x00_read(di, BQ27425_REG_SOC, false);
else
rsoc = bq27x00_read(di, BQ27000_REG_RSOC, true);
@@ -174,7 +199,7 @@ static int bq27x00_battery_read_charge(struct bq27x00_device_info *di, u8 reg)
return charge;
}
- if (di->chip == BQ27500)
+ if (di->chip == BQ27500 || di->chip == BQ27425)
charge *= 1000;
else
charge = charge * 3570 / BQ27000_RS;
@@ -188,6 +213,8 @@ static int bq27x00_battery_read_charge(struct bq27x00_device_info *di, u8 reg)
*/
static inline int bq27x00_battery_read_nac(struct bq27x00_device_info *di)
{
+ if (di->chip == BQ27425)
+ return bq27x00_battery_read_charge(di, BQ27425_REG_NAC);
return bq27x00_battery_read_charge(di, BQ27x00_REG_NAC);
}
@@ -197,6 +224,8 @@ static inline int bq27x00_battery_read_nac(struct bq27x00_device_info *di)
*/
static inline int bq27x00_battery_read_lmd(struct bq27x00_device_info *di)
{
+ if (di->chip == BQ27425)
+ return bq27x00_battery_read_charge(di, BQ27425_REG_FCC);
return bq27x00_battery_read_charge(di, BQ27x00_REG_LMD);
}
@@ -208,7 +237,7 @@ static int bq27x00_battery_read_ilmd(struct bq27x00_device_info *di)
{
int ilmd;
- if (di->chip == BQ27500)
+ if (di->chip == BQ27500 || di->chip == BQ27425)
ilmd = bq27x00_read(di, BQ27500_REG_DCAP, false);
else
ilmd = bq27x00_read(di, BQ27000_REG_ILMD, true);
@@ -218,7 +247,7 @@ static int bq27x00_battery_read_ilmd(struct bq27x00_device_info *di)
return ilmd;
}
- if (di->chip == BQ27500)
+ if (di->chip == BQ27500 || di->chip == BQ27425)
ilmd *= 1000;
else
ilmd = ilmd * 256 * 3570 / BQ27000_RS;
@@ -256,13 +285,16 @@ static int bq27x00_battery_read_temperature(struct bq27x00_device_info *di)
{
int temp;
- temp = bq27x00_read(di, BQ27x00_REG_TEMP, false);
+ if (di->chip == BQ27425)
+ temp = bq27x00_read(di, BQ27425_REG_TEMP, false);
+ else
+ temp = bq27x00_read(di, BQ27x00_REG_TEMP, false);
if (temp < 0) {
dev_err(di->dev, "error reading temperature\n");
return temp;
}
- if (di->chip == BQ27500)
+ if (di->chip == BQ27500 || di->chip == BQ27425)
temp -= 2731;
else
temp = ((temp * 5) - 5463) / 2;
@@ -310,10 +342,15 @@ static void bq27x00_update(struct bq27x00_device_info *di)
{
struct bq27x00_reg_cache cache = {0, };
bool is_bq27500 = di->chip == BQ27500;
+ bool is_bq27425 = di->chip == BQ27425;
- cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, !is_bq27500);
+ if (is_bq27425)
+ cache.flags = bq27x00_read(di, BQ27425_REG_FLAGS, !is_bq27425);
+ else
+ cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, !is_bq27500);
if (cache.flags >= 0) {
- if (!is_bq27500 && (cache.flags & BQ27000_FLAG_CI)) {
+ if (!is_bq27500 && !is_bq27425
+ && (cache.flags & BQ27000_FLAG_CI)) {
dev_info(di->dev, "battery is not calibrated! ignoring capacity values\n");
cache.capacity = -ENODATA;
cache.energy = -ENODATA;
@@ -323,14 +360,23 @@ static void bq27x00_update(struct bq27x00_device_info *di)
cache.charge_full = -ENODATA;
} else {
cache.capacity = bq27x00_battery_read_rsoc(di);
- cache.energy = bq27x00_battery_read_energy(di);
- cache.time_to_empty = bq27x00_battery_read_time(di, BQ27x00_REG_TTE);
- cache.time_to_empty_avg = bq27x00_battery_read_time(di, BQ27x00_REG_TTECP);
- cache.time_to_full = bq27x00_battery_read_time(di, BQ27x00_REG_TTF);
+ if (!is_bq27425) {
+ cache.energy = bq27x00_battery_read_energy(di);
+ cache.time_to_empty =
+ bq27x00_battery_read_time(di,
+ BQ27x00_REG_TTE);
+ cache.time_to_empty_avg =
+ bq27x00_battery_read_time(di,
+ BQ27x00_REG_TTECP);
+ cache.time_to_full =
+ bq27x00_battery_read_time(di,
+ BQ27x00_REG_TTF);
+ }
cache.charge_full = bq27x00_battery_read_lmd(di);
}
cache.temperature = bq27x00_battery_read_temperature(di);
- cache.cycle_count = bq27x00_battery_read_cyct(di);
+ if (!is_bq27425)
+ cache.cycle_count = bq27x00_battery_read_cyct(di);
/* We only have to read charge design full once */
if (di->charge_design_full <= 0)
@@ -370,13 +416,16 @@ static int bq27x00_battery_current(struct bq27x00_device_info *di,
int curr;
int flags;
- curr = bq27x00_read(di, BQ27x00_REG_AI, false);
+ if (di->chip == BQ27425)
+ curr = bq27x00_read(di, BQ27425_REG_AI, false);
+ else
+ curr = bq27x00_read(di, BQ27x00_REG_AI, false);
if (curr < 0) {
dev_err(di->dev, "error reading current\n");
return curr;
}
- if (di->chip == BQ27500) {
+ if (di->chip == BQ27500 || di->chip == BQ27425) {
/* bq27500 returns signed value */
val->intval = (int)((s16)curr) * 1000;
} else {
@@ -397,7 +446,7 @@ static int bq27x00_battery_status(struct bq27x00_device_info *di,
{
int status;
- if (di->chip == BQ27500) {
+ if (di->chip == BQ27500 || di->chip == BQ27425) {
if (di->cache.flags & BQ27500_FLAG_FC)
status = POWER_SUPPLY_STATUS_FULL;
else if (di->cache.flags & BQ27500_FLAG_DSC)
@@ -425,7 +474,7 @@ static int bq27x00_battery_capacity_level(struct bq27x00_device_info *di,
{
int level;
- if (di->chip == BQ27500) {
+ if (di->chip == BQ27500 || di->chip == BQ27425) {
if (di->cache.flags & BQ27500_FLAG_FC)
level = POWER_SUPPLY_CAPACITY_LEVEL_FULL;
else if (di->cache.flags & BQ27500_FLAG_SOC1)
@@ -459,7 +508,10 @@ static int bq27x00_battery_voltage(struct bq27x00_device_info *di,
{
int volt;
- volt = bq27x00_read(di, BQ27x00_REG_VOLT, false);
+ if (di->chip == BQ27425)
+ volt = bq27x00_read(di, BQ27425_REG_VOLT, false);
+ else
+ volt = bq27x00_read(di, BQ27x00_REG_VOLT, false);
if (volt < 0) {
dev_err(di->dev, "error reading voltage\n");
return volt;
@@ -570,8 +622,14 @@ static int bq27x00_powersupply_init(struct bq27x00_device_info *di)
int ret;
di->bat.type = POWER_SUPPLY_TYPE_BATTERY;
- di->bat.properties = bq27x00_battery_props;
- di->bat.num_properties = ARRAY_SIZE(bq27x00_battery_props);
+ di->chip = BQ27425;
+ if (di->chip == BQ27425) {
+ di->bat.properties = bq27425_battery_props;
+ di->bat.num_properties = ARRAY_SIZE(bq27425_battery_props);
+ } else {
+ di->bat.properties = bq27x00_battery_props;
+ di->bat.num_properties = ARRAY_SIZE(bq27x00_battery_props);
+ }
di->bat.get_property = bq27x00_battery_get_property;
di->bat.external_power_changed = bq27x00_external_power_changed;
@@ -729,6 +787,7 @@ static int bq27x00_battery_remove(struct i2c_client *client)
static const struct i2c_device_id bq27x00_id[] = {
{ "bq27200", BQ27000 }, /* bq27200 is same as bq27000, but with i2c */
{ "bq27500", BQ27500 },
+ { "bq27425", BQ27425 },
{},
};
MODULE_DEVICE_TABLE(i2c, bq27x00_id);
--
1.7.1
On 06/18/2012 06:07 PM, Saranya Gopal wrote:
> This patch adds support for BQ27425 (TI) chip. This
> chip is same as BQ27500 with few registers removed
> and register address map changed. The data sheet for
> this chip is publicly available at
> http://www.ti.com/product/bq27425-g1
>
> Changes since v1:
> Remove the additional Kconfig entry
> Add a second power_supply_property array for bq27425
> and assign the appropriate array at run-time based
> on battery type.
> Signed-off-by: Saranya Gopal <[email protected]>
Looks mostly good. Two comments inline.
> ---
> drivers/power/bq27x00_battery.c | 99 +++++++++++++++++++++++++++++++--------
> 1 files changed, 79 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
> index f5d6d37..58775ea 100644
> --- a/drivers/power/bq27x00_battery.c
> +++ b/drivers/power/bq27x00_battery.c
> @@ -22,6 +22,7 @@
> * Datasheets:
> * http://focus.ti.com/docs/prod/folders/print/bq27000.html
> * http://focus.ti.com/docs/prod/folders/print/bq27500.html
> + * http://www.ti.com/product/bq27425-g1
> */
>
> #include <linux/module.h>
> @@ -67,6 +68,14 @@
> #define BQ27500_FLAG_SOC1 BIT(2) /* State-of-Charge threshold 1 */
> #define BQ27500_FLAG_FC BIT(9)
>
> +#define BQ27425_REG_TEMP 0x02
> +#define BQ27425_REG_VOLT 0x04
> +#define BQ27425_REG_FLAGS 0x06
> +#define BQ27425_REG_NAC 0x08
> +#define BQ27425_REG_FCC 0x0E
> +#define BQ27425_REG_AI 0x10
> +#define BQ27425_REG_SOC 0x1C
It looks as if all these register addresses (with the exception of REG_SOC)
are the same as the BQ27X00 register address minus 4.
What do you think about applying this offset in bq27x00_read? This would
safe us a lot of these
if (di->chip == BQ27425)
curr = bq27x00_read(di, BQ27425_REG_..., false);
else
curr = bq27x00_read(di, BQ27x00_REG_..., false);
> [...]
>
> - if (di->chip == BQ27500)
> + if (di->chip == BQ27500 || di->chip == BQ27425)
Maybe it makes sense to put this check in a small helper function, this will
make it less noisy to add another chip with a similar register layout.
> [...]