Revert "bq27x00_battery: Fix reporting status value for bq27500 battery"

This reverts commit 270968c0984aeed096da3cfffb0e131f4c416166.

Grazvydas Ignotas wrote:

After 270968c0984ae "bq27x00_battery: Fix reporting status value for
bq27500 battery" status doesn't seem to be reported correctly when the
battery is close to fully charged state. It reports "Not charging"
while in fact there is >130mA current flowing to the battery according
to current_now.

This status report seems to be based on CHG bit in status register,
but looking at the datasheet the description says "(Fast) charging
allowed", which I guess means that the chip recommends charging and
not that charging is actually going on? If you check the bit while
battery is discharging and it's not full, the bit is also set.

Suggested-by: Grazvydas Ignotas <notasas@gmail.com>
Acked-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>

1 files changed, 4 insertions, 9 deletions

diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 98bf5676318d..d4b5281dea15 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -62,11 +62,10 @@
 
 #define BQ27500_REG_SOC                 0x2C
 #define BQ27500_REG_DCAP                0x3C /* Design capacity */
-#define BQ27500_FLAG_DSG                BIT(0) /* Discharging */
+#define BQ27500_FLAG_DSC                BIT(0)
 #define BQ27500_FLAG_SOCF               BIT(1) /* State-of-Charge threshold final */
 #define BQ27500_FLAG_SOC1               BIT(2) /* State-of-Charge threshold 1 */
-#define BQ27500_FLAG_CHG                BIT(8) /* Charging */
-#define BQ27500_FLAG_FC                 BIT(9) /* Fully charged */
+#define BQ27500_FLAG_FC                 BIT(9)
 
 #define BQ27000_RS                      20 /* Resistor sense */
 
@@ -401,14 +400,10 @@ static int bq27x00_battery_status(struct bq27x00_device_info *di,
         if (di->chip == BQ27500) {
                 if (di->cache.flags & BQ27500_FLAG_FC)
                         status = POWER_SUPPLY_STATUS_FULL;
-                else if (di->cache.flags & BQ27500_FLAG_DSG)
+                else if (di->cache.flags & BQ27500_FLAG_DSC)
                         status = POWER_SUPPLY_STATUS_DISCHARGING;
-                else if (di->cache.flags & BQ27500_FLAG_CHG)
-                        status = POWER_SUPPLY_STATUS_CHARGING;
-                else if (power_supply_am_i_supplied(&di->bat))
-                        status = POWER_SUPPLY_STATUS_NOT_CHARGING;
                 else
-                        status = POWER_SUPPLY_STATUS_UNKNOWN;
+                        status = POWER_SUPPLY_STATUS_CHARGING;
         } else {
                 if (di->cache.flags & BQ27000_FLAG_FC)
                         status = POWER_SUPPLY_STATUS_FULL;