power: pm8921-charger: add reverse boost fix for dc_in
Reverse boosting is also seen on the DC charging path
and may cause charger removal detection problems.
Fix this by changing the reverse boost detection to only
check the active charging path. Only the active charging
path will see reverse boosting voltages because the other
path's OVP will automatically be opened (off) by the
hardware.
Change-Id: I23a48cd49d912e2bb2651159ec91d0ccfa7f5e0d
Signed-off-by: David Keitel <dkeitel@codeaurora.org>
diff --git a/drivers/power/pm8921-charger.c b/drivers/power/pm8921-charger.c
index 0f7c4c3..f84e3ac 100644
--- a/drivers/power/pm8921-charger.c
+++ b/drivers/power/pm8921-charger.c
@@ -269,6 +269,7 @@
int rconn_mohm;
enum pm8921_chg_led_src_config led_src_config;
bool host_mode;
+ u8 active_path;
};
/* user space parameter to limit usb current */
@@ -2029,6 +2030,11 @@
return;
}
+ schedule_delayed_work(&chip->unplug_check_work,
+ round_jiffies_relative(msecs_to_jiffies
+ (UNPLUG_CHECK_WAIT_PERIOD_MS)));
+ pm8921_chg_enable_irq(chip, CHG_GONE_IRQ);
+
power_supply_set_online(chip->ext_psy, dc_present);
power_supply_set_charge_type(chip->ext_psy,
POWER_SUPPLY_CHARGE_TYPE_FAST);
@@ -2043,51 +2049,51 @@
power_supply_changed(&chip->batt_psy);
}
-static void turn_off_usb_ovp_fet(struct pm8921_chg_chip *chip)
+static void turn_off_ovp_fet(struct pm8921_chg_chip *chip, u16 ovptestreg)
{
u8 temp;
int rc;
- rc = pm8xxx_writeb(chip->dev->parent, USB_OVP_TEST, 0x30);
+ rc = pm8xxx_writeb(chip->dev->parent, ovptestreg, 0x30);
if (rc) {
- pr_err("Failed to write 0x30 to USB_OVP_TEST rc = %d\n", rc);
+ pr_err("Failed to write 0x30 to OVP_TEST rc = %d\n", rc);
return;
}
- rc = pm8xxx_readb(chip->dev->parent, USB_OVP_TEST, &temp);
+ rc = pm8xxx_readb(chip->dev->parent, ovptestreg, &temp);
if (rc) {
- pr_err("Failed to read from USB_OVP_TEST rc = %d\n", rc);
+ pr_err("Failed to read from OVP_TEST rc = %d\n", rc);
return;
}
/* set ovp fet disable bit and the write bit */
temp |= 0x81;
- rc = pm8xxx_writeb(chip->dev->parent, USB_OVP_TEST, temp);
+ rc = pm8xxx_writeb(chip->dev->parent, ovptestreg, temp);
if (rc) {
- pr_err("Failed to write 0x%x USB_OVP_TEST rc=%d\n", temp, rc);
+ pr_err("Failed to write 0x%x OVP_TEST rc=%d\n", temp, rc);
return;
}
}
-static void turn_on_usb_ovp_fet(struct pm8921_chg_chip *chip)
+static void turn_on_ovp_fet(struct pm8921_chg_chip *chip, u16 ovptestreg)
{
u8 temp;
int rc;
- rc = pm8xxx_writeb(chip->dev->parent, USB_OVP_TEST, 0x30);
+ rc = pm8xxx_writeb(chip->dev->parent, ovptestreg, 0x30);
if (rc) {
- pr_err("Failed to write 0x30 to USB_OVP_TEST rc = %d\n", rc);
+ pr_err("Failed to write 0x30 to OVP_TEST rc = %d\n", rc);
return;
}
- rc = pm8xxx_readb(chip->dev->parent, USB_OVP_TEST, &temp);
+ rc = pm8xxx_readb(chip->dev->parent, ovptestreg, &temp);
if (rc) {
- pr_err("Failed to read from USB_OVP_TEST rc = %d\n", rc);
+ pr_err("Failed to read from OVP_TEST rc = %d\n", rc);
return;
}
/* unset ovp fet disable bit and set the write bit */
temp &= 0xFE;
temp |= 0x80;
- rc = pm8xxx_writeb(chip->dev->parent, USB_OVP_TEST, temp);
+ rc = pm8xxx_writeb(chip->dev->parent, ovptestreg, temp);
if (rc) {
- pr_err("Failed to write 0x%x to USB_OVP_TEST rc = %d\n",
+ pr_err("Failed to write 0x%x to OVP_TEST rc = %d\n",
temp, rc);
return;
}
@@ -2096,38 +2102,66 @@
static int param_open_ovp_counter = 10;
module_param(param_open_ovp_counter, int, 0644);
+#define USB_ACTIVE_BIT BIT(5)
+#define DC_ACTIVE_BIT BIT(6)
+static int is_active_chg_plugged_in(struct pm8921_chg_chip *chip,
+ u8 active_chg_mask)
+{
+ if (active_chg_mask & USB_ACTIVE_BIT)
+ return pm_chg_get_rt_status(chip, USBIN_VALID_IRQ);
+ else if (active_chg_mask & DC_ACTIVE_BIT)
+ return pm_chg_get_rt_status(chip, DCIN_VALID_IRQ);
+ else
+ return 0;
+}
+
#define WRITE_BANK_4 0xC0
-#define USB_OVP_DEBOUNCE_TIME 0x06
+#define OVP_DEBOUNCE_TIME 0x06
static void unplug_ovp_fet_open(struct pm8921_chg_chip *chip)
{
- int chg_gone = 0, usb_chg_plugged_in = 0;
+ int chg_gone = 0, active_chg_plugged_in = 0;
int count = 0;
+ u8 active_mask = 0;
+ u16 ovpreg, ovptestreg;
+
+ if (is_usb_chg_plugged_in(chip) &&
+ (chip->active_path & USB_ACTIVE_BIT)) {
+ ovpreg = USB_OVP_CONTROL;
+ ovptestreg = USB_OVP_TEST;
+ active_mask = USB_ACTIVE_BIT;
+ } else if (is_dc_chg_plugged_in(chip) &&
+ (chip->active_path & DC_ACTIVE_BIT)) {
+ ovpreg = DC_OVP_CONTROL;
+ ovptestreg = DC_OVP_TEST;
+ active_mask = DC_ACTIVE_BIT;
+ } else {
+ return;
+ }
while (count++ < param_open_ovp_counter) {
- pm_chg_masked_write(chip, USB_OVP_CONTROL,
- USB_OVP_DEBOUNCE_TIME, 0x0);
+ pm_chg_masked_write(chip, ovpreg, OVP_DEBOUNCE_TIME, 0x0);
usleep(10);
- usb_chg_plugged_in = is_usb_chg_plugged_in(chip);
+ active_chg_plugged_in
+ = is_active_chg_plugged_in(chip, active_mask);
chg_gone = pm_chg_get_rt_status(chip, CHG_GONE_IRQ);
- pr_debug("OVP FET count = %d chg_gone=%d, usb_valid = %d\n",
- count, chg_gone, usb_chg_plugged_in);
+ pr_debug("OVP FET count = %d chg_gone=%d, active_valid = %d\n",
+ count, chg_gone, active_chg_plugged_in);
/* note usb_chg_plugged_in=0 => chg_gone=1 */
- if (chg_gone == 1 && usb_chg_plugged_in == 1) {
+ if (chg_gone == 1 && active_chg_plugged_in == 1) {
pr_debug("since chg_gone = 1 dis ovp_fet for 20msec\n");
- turn_off_usb_ovp_fet(chip);
+ turn_off_ovp_fet(chip, ovptestreg);
msleep(20);
- turn_on_usb_ovp_fet(chip);
+ turn_on_ovp_fet(chip, ovptestreg);
} else {
break;
}
}
- pm_chg_masked_write(chip, USB_OVP_CONTROL,
- USB_OVP_DEBOUNCE_TIME, 0x2);
- pr_debug("Exit count=%d chg_gone=%d, usb_valid=%d\n",
- count, chg_gone, usb_chg_plugged_in);
+ pm_chg_masked_write(chip, ovpreg, OVP_DEBOUNCE_TIME, 0x2);
+ pr_debug("Exit count=%d chg_gone=%d, active_valid=%d\n",
+ count, chg_gone, active_chg_plugged_in);
return;
}
@@ -2352,7 +2386,8 @@
static void attempt_reverse_boost_fix(struct pm8921_chg_chip *chip,
int count, int usb_ma)
{
- __pm8921_charger_vbus_draw(500);
+ if (usb_ma)
+ __pm8921_charger_vbus_draw(500);
pr_debug("count = %d iusb=500mA\n", count);
disable_input_voltage_regulation(chip);
pr_debug("count = %d disable_input_regulation\n", count);
@@ -2366,66 +2401,85 @@
pr_debug("count = %d restoring input regulation and usb_ma = %d\n",
count, usb_ma);
enable_input_voltage_regulation(chip);
- __pm8921_charger_vbus_draw(usb_ma);
+ if (usb_ma)
+ __pm8921_charger_vbus_draw(usb_ma);
}
#define VIN_ACTIVE_BIT BIT(0)
-#define UNPLUG_WRKARND_RESTORE_WAIT_PERIOD_US 200
-#define VIN_MIN_INCREASE_MV 100
+#define UNPLUG_WRKARND_RESTORE_WAIT_PERIOD_US 200
+#define VIN_MIN_INCREASE_MV 100
static void unplug_check_worker(struct work_struct *work)
{
struct delayed_work *dwork = to_delayed_work(work);
struct pm8921_chg_chip *chip = container_of(dwork,
struct pm8921_chg_chip, unplug_check_work);
- u8 reg_loop;
- int ibat, usb_chg_plugged_in, usb_ma;
+ u8 reg_loop, active_path;
+ int rc, ibat, active_chg_plugged_in, usb_ma;
int chg_gone = 0;
reg_loop = 0;
- usb_chg_plugged_in = is_usb_chg_plugged_in(chip);
- if (!usb_chg_plugged_in) {
- pr_debug("Stopping Unplug Check Worker since USB is removed"
- "reg_loop = %d, fsm = %d ibat = %d\n",
- pm_chg_get_regulation_loop(chip),
- pm_chg_get_fsm_state(chip),
- get_prop_batt_current(chip)
- );
+
+ rc = pm8xxx_readb(chip->dev->parent, PBL_ACCESS1, &active_path);
+ if (rc) {
+ pr_err("Failed to read PBL_ACCESS1 rc=%d\n", rc);
+ return;
+ }
+ chip->active_path = active_path;
+
+ active_chg_plugged_in = is_active_chg_plugged_in(chip, active_path);
+ pr_debug("active_path = 0x%x, active_chg_plugged_in = %d\n",
+ active_path, active_chg_plugged_in);
+ if (active_path & USB_ACTIVE_BIT) {
+ pr_debug("USB charger active\n");
+
+ pm_chg_iusbmax_get(chip, &usb_ma);
+ if (usb_ma == 500 && !usb_target_ma) {
+ pr_debug("Stopping Unplug Check Worker USB == 500mA\n");
+ disable_input_voltage_regulation(chip);
+ return;
+ }
+
+ if (usb_ma <= 100) {
+ pr_debug(
+ "Unenumerated or suspended usb_ma = %d skip\n",
+ usb_ma);
+ goto check_again_later;
+ }
+ } else if (active_path & DC_ACTIVE_BIT) {
+ pr_debug("DC charger active\n");
+ } else {
+ /* No charger active */
+ if (!(is_usb_chg_plugged_in(chip)
+ && !(is_dc_chg_plugged_in(chip)))) {
+ pr_debug(
+ "Stop: chg removed reg_loop = %d, fsm = %d ibat = %d\n",
+ pm_chg_get_regulation_loop(chip),
+ pm_chg_get_fsm_state(chip),
+ get_prop_batt_current(chip)
+ );
+ }
return;
}
- pm_chg_iusbmax_get(chip, &usb_ma);
- if (usb_ma == 500 && !usb_target_ma) {
- pr_debug("Stopping Unplug Check Worker since USB == 500mA\n");
- disable_input_voltage_regulation(chip);
- return;
- }
-
- if (usb_ma <= 100) {
- pr_debug(
- "Unenumerated yet or suspended usb_ma = %d skipping\n",
- usb_ma);
- goto check_again_later;
- }
- if (pm8921_chg_is_enabled(chip, CHG_GONE_IRQ))
- pr_debug("chg gone irq is enabled\n");
-
- reg_loop = pm_chg_get_regulation_loop(chip);
- pr_debug("reg_loop=0x%x usb_ma = %d\n", reg_loop, usb_ma);
-
- if ((reg_loop & VIN_ACTIVE_BIT) && (usb_ma > USB_WALL_THRESHOLD_MA)) {
- decrease_usb_ma_value(&usb_ma);
- usb_target_ma = usb_ma;
- /* end AICL here */
- __pm8921_charger_vbus_draw(usb_ma);
- pr_debug("usb_now=%d, usb_target = %d\n",
- usb_ma, usb_target_ma);
+ if (active_path & USB_ACTIVE_BIT) {
+ reg_loop = pm_chg_get_regulation_loop(chip);
+ pr_debug("reg_loop=0x%x usb_ma = %d\n", reg_loop, usb_ma);
+ if ((reg_loop & VIN_ACTIVE_BIT) &&
+ (usb_ma > USB_WALL_THRESHOLD_MA)) {
+ decrease_usb_ma_value(&usb_ma);
+ usb_target_ma = usb_ma;
+ /* end AICL here */
+ __pm8921_charger_vbus_draw(usb_ma);
+ pr_debug("usb_now=%d, usb_target = %d\n",
+ usb_ma, usb_target_ma);
+ }
}
reg_loop = pm_chg_get_regulation_loop(chip);
pr_debug("reg_loop=0x%x usb_ma = %d\n", reg_loop, usb_ma);
+ ibat = get_prop_batt_current(chip);
if (reg_loop & VIN_ACTIVE_BIT) {
- ibat = get_prop_batt_current(chip);
pr_debug("ibat = %d fsm = %d reg_loop = 0x%x\n",
ibat, pm_chg_get_fsm_state(chip), reg_loop);
@@ -2433,25 +2487,36 @@
int count = 0;
while (count++ < param_vin_disable_counter
- && usb_chg_plugged_in == 1) {
- attempt_reverse_boost_fix(chip, count, usb_ma);
- usb_chg_plugged_in
- = is_usb_chg_plugged_in(chip);
+ && active_chg_plugged_in == 1) {
+ if (active_path & USB_ACTIVE_BIT)
+ attempt_reverse_boost_fix(chip,
+ count, usb_ma);
+ else
+ attempt_reverse_boost_fix(chip,
+ count, 0);
+ /* after reverse boost fix check if the active
+ * charger was detected as removed */
+ active_chg_plugged_in
+ = is_active_chg_plugged_in(chip,
+ active_path);
+ pr_debug("active_chg_plugged_in = %d\n",
+ active_chg_plugged_in);
}
}
}
- usb_chg_plugged_in = is_usb_chg_plugged_in(chip);
+ active_chg_plugged_in = is_active_chg_plugged_in(chip, active_path);
+ pr_debug("active_path = 0x%x, active_chg = %d\n",
+ active_path, active_chg_plugged_in);
chg_gone = pm_chg_get_rt_status(chip, CHG_GONE_IRQ);
- if (chg_gone == 1 && usb_chg_plugged_in == 1) {
- /* run the worker directly */
- pr_debug(" ver5 step: chg_gone=%d, usb_valid = %d\n",
- chg_gone, usb_chg_plugged_in);
+ if (chg_gone == 1 && active_chg_plugged_in == 1) {
+ pr_debug("chg_gone=%d, active_chg_plugged_in = %d\n",
+ chg_gone, active_chg_plugged_in);
unplug_ovp_fet_open(chip);
}
- if (!(reg_loop & VIN_ACTIVE_BIT)) {
+ if (!(reg_loop & VIN_ACTIVE_BIT) && (active_path & USB_ACTIVE_BIT)) {
/* only increase iusb_max if vin loop not active */
if (usb_ma < usb_target_ma) {
increase_usb_ma_value(&usb_ma);