3 files changed, 46 insertions, 0 deletions

diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
index c5e1bf0c14b0..cd483ec61648 100644
--- a/drivers/power/supply/bq27xxx_battery.c
+++ b/drivers/power/supply/bq27xxx_battery.c
@@ -27,6 +27,7 @@
  * http://www.ti.com/product/bq27510-g3
  * http://www.ti.com/product/bq27520-g4
  * http://www.ti.com/product/bq27520-g1
+ * http://www.ti.com/product/bq27520-g2
  * http://www.ti.com/product/bq27530-g1
  * http://www.ti.com/product/bq27531-g1
  * http://www.ti.com/product/bq27541-g1
@@ -281,6 +282,25 @@ static u8 bq27xxx_regs[][BQ27XXX_REG_MAX] = {
                 [BQ27XXX_REG_DCAP] = 0x3c,
                 [BQ27XXX_REG_AP] = 0x24,
         },
+        [BQ27520G2] = {
+                [BQ27XXX_REG_CTRL] = 0x00,
+                [BQ27XXX_REG_TEMP] = 0x06,
+                [BQ27XXX_REG_INT_TEMP] = 0x36,
+                [BQ27XXX_REG_VOLT] = 0x08,
+                [BQ27XXX_REG_AI] = 0x14,
+                [BQ27XXX_REG_FLAGS] = 0x0a,
+                [BQ27XXX_REG_TTE] = 0x16,
+                [BQ27XXX_REG_TTF] = 0x18,
+                [BQ27XXX_REG_TTES] = 0x1c,
+                [BQ27XXX_REG_TTECP] = 0x26,
+                [BQ27XXX_REG_NAC] = 0x0c,
+                [BQ27XXX_REG_FCC] = 0x12,
+                [BQ27XXX_REG_CYCT] = 0x2a,
+                [BQ27XXX_REG_AE] = 0x22,
+                [BQ27XXX_REG_SOC] = 0x2c,
+                [BQ27XXX_REG_DCAP] = 0x3c,
+                [BQ27XXX_REG_AP] = 0x24,
+        },
         [BQ27530] = {
                 [BQ27XXX_REG_CTRL] = 0x00,
                 [BQ27XXX_REG_TEMP] = 0x06,
@@ -538,6 +558,27 @@ static enum power_supply_property bq27520g1_battery_props[] = {
         POWER_SUPPLY_PROP_MANUFACTURER,
 };
 
+static enum power_supply_property bq27520g2_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_TIME_TO_EMPTY_NOW,
+        POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
+        POWER_SUPPLY_PROP_TECHNOLOGY,
+        POWER_SUPPLY_PROP_CHARGE_FULL,
+        POWER_SUPPLY_PROP_CHARGE_NOW,
+        POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
+        POWER_SUPPLY_PROP_CYCLE_COUNT,
+        POWER_SUPPLY_PROP_ENERGY_NOW,
+        POWER_SUPPLY_PROP_POWER_AVG,
+        POWER_SUPPLY_PROP_HEALTH,
+        POWER_SUPPLY_PROP_MANUFACTURER,
+};
+
 static enum power_supply_property bq27530_battery_props[] = {
         POWER_SUPPLY_PROP_STATUS,
         POWER_SUPPLY_PROP_PRESENT,
@@ -627,6 +668,7 @@ static struct {
         BQ27XXX_PROP(BQ27510G2, bq27510g2_battery_props),
         BQ27XXX_PROP(BQ27510G3, bq27510g3_battery_props),
         BQ27XXX_PROP(BQ27520G1, bq27520g1_battery_props),
+        BQ27XXX_PROP(BQ27520G2, bq27520g2_battery_props),
         BQ27XXX_PROP(BQ27530, bq27530_battery_props),
         BQ27XXX_PROP(BQ27541, bq27541_battery_props),
         BQ27XXX_PROP(BQ27545, bq27545_battery_props),
@@ -886,6 +928,7 @@ static bool bq27xxx_battery_overtemp(struct bq27xxx_device_info *di, u16 flags)
         case BQ27510G2:
         case BQ27510G3:
         case BQ27520G1:
+        case BQ27520G2:
         case BQ27541:
         case BQ27545:
                 return flags & (BQ27XXX_FLAG_OTC | BQ27XXX_FLAG_OTD);
diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c
index e398edebbe4d..b2898994ab85 100644
--- a/drivers/power/supply/bq27xxx_battery_i2c.c
+++ b/drivers/power/supply/bq27xxx_battery_i2c.c
@@ -156,6 +156,7 @@ static const struct i2c_device_id bq27xxx_i2c_id_table[] = {
         { "bq27510g2", BQ27510G2 },
         { "bq27510g3", BQ27510G3 },
         { "bq27520g1", BQ27520G1 },
+        { "bq27520g2", BQ27520G2 },
         { "bq27530", BQ27530 },
         { "bq27531", BQ27530 },
         { "bq27541", BQ27541 },
@@ -183,6 +184,7 @@ static const struct of_device_id bq27xxx_battery_i2c_of_match_table[] = {
         { .compatible = "ti,bq27510g2" },
         { .compatible = "ti,bq27510g3" },
         { .compatible = "ti,bq27520g1" },
+        { .compatible = "ti,bq27520g2" },
         { .compatible = "ti,bq27530" },
         { .compatible = "ti,bq27531" },
         { .compatible = "ti,bq27541" },
diff --git a/include/linux/power/bq27xxx_battery.h b/include/linux/power/bq27xxx_battery.h
index eddd96936875..a3fc34a4ef72 100644
--- a/include/linux/power/bq27xxx_battery.h
+++ b/include/linux/power/bq27xxx_battery.h
@@ -11,6 +11,7 @@ enum bq27xxx_chip {
         BQ27510G2, /* bq27510G2 */
         BQ27510G3, /* bq27510G3 */
         BQ27520G1, /* bq27520G1 */
+        BQ27520G2, /* bq27520G2 */
         BQ27530, /* bq27530, bq27531 */
         BQ27541, /* bq27541, bq27542, bq27546, bq27742 */
         BQ27545, /* bq27545 */