1 files changed, 45 insertions, 7 deletions

diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index e10763e3a1d5..5b9f0eacb20a 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -23,6 +23,7 @@
  * 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
+ * http://www.ti.com/product/BQ27742-G1
  */
 
 #include <linux/device.h>
@@ -71,6 +72,8 @@
 #define BQ27500_FLAG_FC                 BIT(9)
 #define BQ27500_FLAG_OTC                BIT(15)
 
+#define BQ27742_POWER_AVG               0x76
+
 /* bq27425 register addresses are same as bq27x00 addresses minus 4 */
 #define BQ27425_REG_OFFSET              0x04
 #define BQ27425_REG_SOC                 0x18 /* Register address plus offset */
@@ -83,7 +86,7 @@ struct bq27x00_access_methods {
         int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
 };
 
-enum bq27x00_chip { BQ27000, BQ27500, BQ27425};
+enum bq27x00_chip { BQ27000, BQ27500, BQ27425, BQ27742};
 
 struct bq27x00_reg_cache {
         int temperature;
@@ -152,6 +155,24 @@ static enum power_supply_property bq27425_battery_props[] = {
         POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
 };
 
+static enum power_supply_property bq27742_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_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_POWER_AVG,
+        POWER_SUPPLY_PROP_HEALTH,
+};
+
 static unsigned int poll_interval = 360;
 module_param(poll_interval, uint, 0644);
 MODULE_PARM_DESC(poll_interval, "battery poll interval in seconds - " \
@@ -176,7 +197,7 @@ static inline int bq27x00_read(struct bq27x00_device_info *di, u8 reg,
  */
 static bool bq27xxx_is_chip_version_higher(struct bq27x00_device_info *di)
 {
-        if (di->chip == BQ27425 || di->chip == BQ27500)
+        if (di->chip == BQ27425 || di->chip == BQ27500 || di->chip == BQ27742)
                 return true;
         return false;
 }
@@ -189,7 +210,7 @@ static int bq27x00_battery_read_rsoc(struct bq27x00_device_info *di)
 {
         int rsoc;
 
-        if (di->chip == BQ27500)
+        if (di->chip == BQ27500 || di->chip == BQ27742)
                 rsoc = bq27x00_read(di, BQ27500_REG_SOC, false);
         else if (di->chip == BQ27425)
                 rsoc = bq27x00_read(di, BQ27425_REG_SOC, false);
@@ -414,6 +435,7 @@ 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;
+        bool is_bq27742 = di->chip == BQ27742;
 
         cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, !is_bq27500);
         if ((cache.flags & 0xff) == 0xff)
@@ -432,7 +454,11 @@ static void bq27x00_update(struct bq27x00_device_info *di)
                         cache.health = -ENODATA;
                 } else {
                         cache.capacity = bq27x00_battery_read_rsoc(di);
-                        if (!is_bq27425) {
+                        if (is_bq27742)
+                                cache.time_to_empty =
+                                        bq27x00_battery_read_time(di,
+                                                        BQ27x00_REG_TTE);
+                        else if (!is_bq27425) {
                                 cache.energy = bq27x00_battery_read_energy(di);
                                 cache.time_to_empty =
                                         bq27x00_battery_read_time(di,
@@ -444,14 +470,22 @@ static void bq27x00_update(struct bq27x00_device_info *di)
                                         bq27x00_battery_read_time(di,
                                                         BQ27x00_REG_TTF);
                         }
-                        cache.charge_full = bq27x00_battery_read_lmd(di);
+                        if (!is_bq27742)
+                                cache.charge_full =
+                                        bq27x00_battery_read_lmd(di);
                         cache.health = bq27x00_battery_read_health(di);
                 }
                 cache.temperature = bq27x00_battery_read_temperature(di);
                 if (!is_bq27425)
                         cache.cycle_count = bq27x00_battery_read_cyct(di);
-                cache.power_avg =
-                        bq27x00_battery_read_pwr_avg(di, BQ27x00_POWER_AVG);
+                if (is_bq27742)
+                        cache.power_avg =
+                                bq27x00_battery_read_pwr_avg(di,
+                                                BQ27742_POWER_AVG);
+                else
+                        cache.power_avg =
+                                bq27x00_battery_read_pwr_avg(di,
+                                                BQ27x00_POWER_AVG);
 
                 /* We only have to read charge design full once */
                 if (di->charge_design_full <= 0)
@@ -702,6 +736,9 @@ static int bq27x00_powersupply_init(struct bq27x00_device_info *di)
         if (di->chip == BQ27425) {
                 di->bat.properties = bq27425_battery_props;
                 di->bat.num_properties = ARRAY_SIZE(bq27425_battery_props);
+        } else if (di->chip == BQ27742) {
+                di->bat.properties = bq27742_battery_props;
+                di->bat.num_properties = ARRAY_SIZE(bq27742_battery_props);
         } else {
                 di->bat.properties = bq27x00_battery_props;
                 di->bat.num_properties = ARRAY_SIZE(bq27x00_battery_props);
@@ -858,6 +895,7 @@ static const struct i2c_device_id bq27x00_id[] = {
         { "bq27200", BQ27000 }, /* bq27200 is same as bq27000, but with i2c */
         { "bq27500", BQ27500 },
         { "bq27425", BQ27425 },
+        { "bq27742", BQ27742 },
         {},
 };
 MODULE_DEVICE_TABLE(i2c, bq27x00_id);