commit 9137529d90c95d3d5a149800527491ef4bfc17a9
author Linux Build Service Account <lnxbuild@localhost> Mon Aug 24 05:03:08 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Aug 24 05:03:08 2015 -0700
tree cc2ab3f866d163691de30a7061d29cf35e02a6e2
parent d09a3f542bb00676109c16bc8a6b750838d2b1fc
parent 0b9f7e79775399292f6854f4f2150acb85223998

Merge "dev: pmic: pmi8994: Change the polarity of charger enable"

dev/pmic/pmi8994/pm_app_smbchg.c

diff --git a/dev/pmic/pmi8994/pm_app_smbchg.c b/dev/pmic/pmi8994/pm_app_smbchg.c
index 4d8a2db..d3d1d6b 100644
--- a/dev/pmic/pmi8994/pm_app_smbchg.c
+++ b/dev/pmic/pmi8994/pm_app_smbchg.c
@@ -203,8 +203,8 @@
       {
           //Ensure that Charging is enabled
           err_flag |= pm_smbchg_chgr_enable_src(device_index, FALSE);
-          err_flag |= pm_smbchg_chgr_set_chg_polarity_low(device_index, FALSE);
-          err_flag |= pm_smbchg_bat_if_config_chg_cmd(device_index, PM_SMBCHG_BAT_IF_CMD__EN_BAT_CHG, TRUE);
+          err_flag |= pm_smbchg_chgr_set_chg_polarity_low(device_index, TRUE);
+          err_flag |= pm_smbchg_bat_if_config_chg_cmd(device_index, PM_SMBCHG_BAT_IF_CMD__EN_BAT_CHG, FALSE);
           udelay(PM_WEAK_BATTERY_CHARGING_DELAY);
       }
 

dev/pmic/pmi8994/pm_smbchg_chgr.c

diff --git a/dev/pmic/pmi8994/pm_smbchg_chgr.c b/dev/pmic/pmi8994/pm_smbchg_chgr.c
index 2179772..629ba15 100644
--- a/dev/pmic/pmi8994/pm_smbchg_chgr.c
+++ b/dev/pmic/pmi8994/pm_smbchg_chgr.c
@@ -1084,7 +1084,7 @@
       pm_register_address_type chgr_cfg2 = smbchg_ptr->smbchg_register->chgr_register->base_address + smbchg_ptr->smbchg_register->chgr_register->chgr_cfg2;
 
       err_flag = pm_smbchg_chgr_unlock_perph_write(smbchg_ptr);
-      err_flag |= pm_comm_write_byte_mask(smbchg_ptr->comm_ptr->slave_id, chgr_cfg2, 0x40, chg_pol_low, 0);
+      err_flag |= pm_comm_write_byte_mask(smbchg_ptr->comm_ptr->slave_id, chgr_cfg2, 0x40, (chg_pol_low ? 0x40 : 0), 0);
    }
 
    return err_flag;