ds2782_battery: Add support for ds2786 battery gas gauge

Signed-off-by: Yulia Vilensky <vilensky@compulab.co.il>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>

3 files changed, 146 insertions, 50 deletions

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 22f2fa912127..c59bcb7c6eb0 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -65,10 +65,10 @@ config BATTERY_DS2760
           Say Y here to enable support for batteries with ds2760 chip.
 
 config BATTERY_DS2782
-        tristate "DS2782 standalone gas-gauge"
+        tristate "DS2782/DS2786 standalone gas-gauge"
         depends on I2C
         help
-          Say Y here to enable support for the DS2782 standalone battery
+          Say Y here to enable support for the DS2782/DS2786 standalone battery
           gas-gauge.
 
 config BATTERY_PMU
diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
index ba1bd1a545be..c665e8007235 100644
--- a/drivers/power/ds2782_battery.c
+++ b/drivers/power/ds2782_battery.c
@@ -5,6 +5,8 @@
  *
  * Author: Ryan Mallon <ryan@bluewatersys.com>
  *
+ * DS2786 added by Yulia Vilensky <vilensky@compulab.co.il>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -20,12 +22,13 @@
 #include <linux/idr.h>
 #include <linux/power_supply.h>
 #include <linux/slab.h>
+#include <linux/ds2782_battery.h>
 
 #define DS2782_REG_RARC         0x06    /* Remaining active relative capacity */
 
-#define DS2782_REG_VOLT_MSB     0x0c
-#define DS2782_REG_TEMP_MSB     0x0a
-#define DS2782_REG_CURRENT_MSB  0x0e
+#define DS278x_REG_VOLT_MSB     0x0c
+#define DS278x_REG_TEMP_MSB     0x0a
+#define DS278x_REG_CURRENT_MSB  0x0e
 
 /* EEPROM Block */
 #define DS2782_REG_RSNSP        0x69    /* Sense resistor value */
@@ -33,18 +36,33 @@
 /* Current unit measurement in uA for a 1 milli-ohm sense resistor */
 #define DS2782_CURRENT_UNITS    1563
 
-#define to_ds2782_info(x) container_of(x, struct ds2782_info, battery)
+#define DS2786_REG_RARC         0x02    /* Remaining active relative capacity */
+
+#define DS2786_CURRENT_UNITS    25
+
+struct ds278x_info;
+
+struct ds278x_battery_ops {
+        int     (*get_current)(struct ds278x_info *info, int *current_uA);
+        int     (*get_voltage)(struct ds278x_info *info, int *voltage_uA);
+        int     (*get_capacity)(struct ds278x_info *info, int *capacity_uA);
+
+};
+
+#define to_ds278x_info(x) container_of(x, struct ds278x_info, battery)
 
-struct ds2782_info {
+struct ds278x_info {
         struct i2c_client       *client;
         struct power_supply     battery;
+        struct ds278x_battery_ops  *ops;
         int                     id;
+        int                     rsns;
 };
 
 static DEFINE_IDR(battery_id);
 static DEFINE_MUTEX(battery_lock);
 
-static inline int ds2782_read_reg(struct ds2782_info *info, int reg, u8 *val)
+static inline int ds278x_read_reg(struct ds278x_info *info, int reg, u8 *val)
 {
         int ret;
 
@@ -58,7 +76,7 @@ static inline int ds2782_read_reg(struct ds2782_info *info, int reg, u8 *val)
         return 0;
 }
 
-static inline int ds2782_read_reg16(struct ds2782_info *info, int reg_msb,
+static inline int ds278x_read_reg16(struct ds278x_info *info, int reg_msb,
                                     s16 *val)
 {
         int ret;
@@ -73,7 +91,7 @@ static inline int ds2782_read_reg16(struct ds2782_info *info, int reg_msb,
         return 0;
 }
 
-static int ds2782_get_temp(struct ds2782_info *info, int *temp)
+static int ds278x_get_temp(struct ds278x_info *info, int *temp)
 {
         s16 raw;
         int err;
@@ -84,14 +102,14 @@ static int ds2782_get_temp(struct ds2782_info *info, int *temp)
          * celsius. The temperature value is stored as a 10 bit number, plus
          * sign in the upper bits of a 16 bit register.
          */
-        err = ds2782_read_reg16(info, DS2782_REG_TEMP_MSB, &raw);
+        err = ds278x_read_reg16(info, DS278x_REG_TEMP_MSB, &raw);
         if (err)
                 return err;
         *temp = ((raw / 32) * 125) / 100;
         return 0;
 }
 
-static int ds2782_get_current(struct ds2782_info *info, int *current_uA)
+static int ds2782_get_current(struct ds278x_info *info, int *current_uA)
 {
         int sense_res;
         int err;
@@ -102,7 +120,7 @@ static int ds2782_get_current(struct ds2782_info *info, int *current_uA)
          * The units of measurement for current are dependent on the value of
          * the sense resistor.
          */
-        err = ds2782_read_reg(info, DS2782_REG_RSNSP, &sense_res_raw);
+        err = ds278x_read_reg(info, DS2782_REG_RSNSP, &sense_res_raw);
         if (err)
                 return err;
         if (sense_res_raw == 0) {
@@ -113,14 +131,14 @@ static int ds2782_get_current(struct ds2782_info *info, int *current_uA)
 
         dev_dbg(&info->client->dev, "sense resistor = %d milli-ohms\n",
                 sense_res);
-        err = ds2782_read_reg16(info, DS2782_REG_CURRENT_MSB, &raw);
+        err = ds278x_read_reg16(info, DS278x_REG_CURRENT_MSB, &raw);
         if (err)
                 return err;
         *current_uA = raw * (DS2782_CURRENT_UNITS / sense_res);
         return 0;
 }
 
-static int ds2782_get_voltage(struct ds2782_info *info, int *voltage_uA)
+static int ds2782_get_voltage(struct ds278x_info *info, int *voltage_uA)
 {
         s16 raw;
         int err;
@@ -129,36 +147,77 @@ static int ds2782_get_voltage(struct ds2782_info *info, int *voltage_uA)
          * Voltage is measured in units of 4.88mV. The voltage is stored as
          * a 10-bit number plus sign, in the upper bits of a 16-bit register
          */
-        err = ds2782_read_reg16(info, DS2782_REG_VOLT_MSB, &raw);
+        err = ds278x_read_reg16(info, DS278x_REG_VOLT_MSB, &raw);
         if (err)
                 return err;
         *voltage_uA = (raw / 32) * 4800;
         return 0;
 }