Commit 5c35ba9b authored by Angus Ainslie (Purism)'s avatar Angus Ainslie (Purism) Committed by Sebastian Reichel

power: supply: bq25890_charger: Add the BQ25895 part

The BQ25895 is almost identical to the BQ25890.
Signed-off-by: default avatarAngus Ainslie (Purism) <angus@akkea.ca>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 20420583
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#define BQ25890_IRQ_PIN "bq25890_irq" #define BQ25890_IRQ_PIN "bq25890_irq"
#define BQ25890_ID 3 #define BQ25890_ID 3
#define BQ25895_ID 7
#define BQ25896_ID 0 #define BQ25896_ID 0
enum bq25890_fields { enum bq25890_fields {
...@@ -171,7 +172,7 @@ static const struct reg_field bq25890_reg_fields[] = { ...@@ -171,7 +172,7 @@ static const struct reg_field bq25890_reg_fields[] = {
[F_WD] = REG_FIELD(0x07, 4, 5), [F_WD] = REG_FIELD(0x07, 4, 5),
[F_TMR_EN] = REG_FIELD(0x07, 3, 3), [F_TMR_EN] = REG_FIELD(0x07, 3, 3),
[F_CHG_TMR] = REG_FIELD(0x07, 1, 2), [F_CHG_TMR] = REG_FIELD(0x07, 1, 2),
[F_JEITA_ISET] = REG_FIELD(0x07, 0, 0), [F_JEITA_ISET] = REG_FIELD(0x07, 0, 0), // reserved on BQ25895
/* REG08 */ /* REG08 */
[F_BATCMP] = REG_FIELD(0x08, 5, 7), [F_BATCMP] = REG_FIELD(0x08, 5, 7),
[F_VCLAMP] = REG_FIELD(0x08, 2, 4), [F_VCLAMP] = REG_FIELD(0x08, 2, 4),
...@@ -180,7 +181,7 @@ static const struct reg_field bq25890_reg_fields[] = { ...@@ -180,7 +181,7 @@ static const struct reg_field bq25890_reg_fields[] = {
[F_FORCE_ICO] = REG_FIELD(0x09, 7, 7), [F_FORCE_ICO] = REG_FIELD(0x09, 7, 7),
[F_TMR2X_EN] = REG_FIELD(0x09, 6, 6), [F_TMR2X_EN] = REG_FIELD(0x09, 6, 6),
[F_BATFET_DIS] = REG_FIELD(0x09, 5, 5), [F_BATFET_DIS] = REG_FIELD(0x09, 5, 5),
[F_JEITA_VSET] = REG_FIELD(0x09, 4, 4), [F_JEITA_VSET] = REG_FIELD(0x09, 4, 4), // reserved on BQ25895
[F_BATFET_DLY] = REG_FIELD(0x09, 3, 3), [F_BATFET_DLY] = REG_FIELD(0x09, 3, 3),
[F_BATFET_RST_EN] = REG_FIELD(0x09, 2, 2), [F_BATFET_RST_EN] = REG_FIELD(0x09, 2, 2),
[F_PUMPX_UP] = REG_FIELD(0x09, 1, 1), [F_PUMPX_UP] = REG_FIELD(0x09, 1, 1),
...@@ -188,7 +189,7 @@ static const struct reg_field bq25890_reg_fields[] = { ...@@ -188,7 +189,7 @@ static const struct reg_field bq25890_reg_fields[] = {
/* REG0A */ /* REG0A */
[F_BOOSTV] = REG_FIELD(0x0A, 4, 7), [F_BOOSTV] = REG_FIELD(0x0A, 4, 7),
/* PFM_OTG_DIS 3 on BQ25896 */ /* PFM_OTG_DIS 3 on BQ25896 */
[F_BOOSTI] = REG_FIELD(0x0A, 0, 2), [F_BOOSTI] = REG_FIELD(0x0A, 0, 2), // reserved on BQ25895
/* REG0B */ /* REG0B */
[F_VBUS_STAT] = REG_FIELD(0x0B, 5, 7), [F_VBUS_STAT] = REG_FIELD(0x0B, 5, 7),
[F_CHG_STAT] = REG_FIELD(0x0B, 3, 4), [F_CHG_STAT] = REG_FIELD(0x0B, 3, 4),
...@@ -392,6 +393,8 @@ static int bq25890_power_supply_get_property(struct power_supply *psy, ...@@ -392,6 +393,8 @@ static int bq25890_power_supply_get_property(struct power_supply *psy,
case POWER_SUPPLY_PROP_MODEL_NAME: case POWER_SUPPLY_PROP_MODEL_NAME:
if (bq->chip_id == BQ25890_ID) if (bq->chip_id == BQ25890_ID)
val->strval = "BQ25890"; val->strval = "BQ25890";
else if (bq->chip_id == BQ25895_ID)
val->strval = "BQ25895";
else if (bq->chip_id == BQ25896_ID) else if (bq->chip_id == BQ25896_ID)
val->strval = "BQ25896"; val->strval = "BQ25896";
else else
...@@ -862,7 +865,8 @@ static int bq25890_probe(struct i2c_client *client, ...@@ -862,7 +865,8 @@ static int bq25890_probe(struct i2c_client *client,
return bq->chip_id; return bq->chip_id;
} }
if ((bq->chip_id != BQ25890_ID) && (bq->chip_id != BQ25896_ID)) { if ((bq->chip_id != BQ25890_ID) && (bq->chip_id != BQ25895_ID)
&& (bq->chip_id != BQ25896_ID)) {
dev_err(dev, "Chip with ID=%d, not supported!\n", bq->chip_id); dev_err(dev, "Chip with ID=%d, not supported!\n", bq->chip_id);
return -ENODEV; return -ENODEV;
} }
......
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