bq2415x_charger: Add support for offline and 100mA mode

* Renamed mode BQ2415X_MODE_NONE to BQ2415X_MODE_OFF because this mode
  turning chaging completly off

* Added new mode BQ2415X_MODE_NONE which enable charging with maximal
  current limit 100mA (this is minimal safe value for bq2415x chips)

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>

diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c
index ca70365e94107dd15de8d047f70882f20c4f0942..ca91396fc48eef616f812bf97e12696a038c61a2 100644 (file)
--- a/drivers/power/bq2415x_charger.c
+++ b/drivers/power/bq2415x_charger.c
@@ -733,12 +733,10 @@ static int bq2415x_set_mode(struct bq2415x_device *bq, enum bq2415x_mode mode)
        int charger = 0;
        int boost = 0;
 
-       if (mode == BQ2415X_MODE_HOST_CHARGER ||
-               mode == BQ2415X_MODE_DEDICATED_CHARGER)
-                       charger = 1;
-
        if (mode == BQ2415X_MODE_BOOST)
                boost = 1;
+       else if (mode != BQ2415X_MODE_OFF)
+               charger = 1;
 
        if (!charger)
                ret = bq2415x_exec_command(bq, BQ2415X_CHARGER_DISABLE);
@@ -750,6 +748,10 @@ static int bq2415x_set_mode(struct bq2415x_device *bq, enum bq2415x_mode mode)
                return ret;
 
        switch (mode) {
+       case BQ2415X_MODE_OFF:
+               dev_dbg(bq->dev, "changing mode to: Offline\n");
+               ret = bq2415x_set_current_limit(bq, 100);
+               break;
        case BQ2415X_MODE_NONE:
                dev_dbg(bq->dev, "changing mode to: N/A\n");
                ret = bq2415x_set_current_limit(bq, 100);
@@ -842,7 +844,7 @@ static void bq2415x_timer_error(struct bq2415x_device *bq, const char *msg)
        dev_err(bq->dev, "%s\n", msg);
        if (bq->automode > 0)
                bq->automode = 0;
-       bq2415x_set_mode(bq, BQ2415X_MODE_NONE);
+       bq2415x_set_mode(bq, BQ2415X_MODE_OFF);
        bq2415x_set_autotimer(bq, 0);
 }
 
@@ -1135,6 +1137,10 @@ static ssize_t bq2415x_sysfs_set_mode(struct device *dev,
                        return -ENOSYS;
                bq->automode = 1;
                mode = bq->reported_mode;
+       } else if (strncmp(buf, "off", 3) == 0) {
+               if (bq->automode > 0)
+                       bq->automode = 0;
+               mode = BQ2415X_MODE_OFF;
        } else if (strncmp(buf, "none", 4) == 0) {
                if (bq->automode > 0)
                        bq->automode = 0;
@@ -1182,6 +1188,9 @@ static ssize_t bq2415x_sysfs_show_mode(struct device *dev,
                ret += sprintf(buf+ret, "auto (");
 
        switch (bq->mode) {
+       case BQ2415X_MODE_OFF:
+               ret += sprintf(buf+ret, "off");
+               break;
        case BQ2415X_MODE_NONE:
                ret += sprintf(buf+ret, "none");
                break;
@@ -1216,6 +1225,8 @@ static ssize_t bq2415x_sysfs_show_reported_mode(struct device *dev,
                return -EINVAL;
 
        switch (bq->reported_mode) {
+       case BQ2415X_MODE_OFF:
+               return sprintf(buf, "off\n");
        case BQ2415X_MODE_NONE:
                return sprintf(buf, "none\n");
        case BQ2415X_MODE_HOST_CHARGER:
@@ -1535,8 +1546,8 @@ static int bq2415x_probe(struct i2c_client *client,
        bq->dev = &client->dev;
        bq->chip = id->driver_data;
        bq->name = name;
-       bq->mode = BQ2415X_MODE_NONE;
-       bq->reported_mode = BQ2415X_MODE_NONE;
+       bq->mode = BQ2415X_MODE_OFF;
+       bq->reported_mode = BQ2415X_MODE_OFF;
        bq->autotimer = 0;
        bq->automode = 0;
 

diff --git a/include/linux/power/bq2415x_charger.h b/include/linux/power/bq2415x_charger.h
index 97a1665eaeafe1f3b5e349e40c7016aa42af0796..8dcc0f46fc0ab44d5d4d34731745a73f42b5eceb 100644 (file)
--- a/include/linux/power/bq2415x_charger.h
+++ b/include/linux/power/bq2415x_charger.h
@@ -75,7 +75,8 @@
 
 /* Supported modes with maximal current limit */
 enum bq2415x_mode {
-       BQ2415X_MODE_NONE,              /* unknown or no charger (100mA) */
+       BQ2415X_MODE_OFF,               /* offline mode (charger disabled) */
+       BQ2415X_MODE_NONE,              /* unknown charger (100mA) */
        BQ2415X_MODE_HOST_CHARGER,      /* usb host/hub charger (500mA) */
        BQ2415X_MODE_DEDICATED_CHARGER, /* dedicated charger (unlimited) */
        BQ2415X_MODE_BOOST,             /* boost mode (charging disabled) */