A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 14:19:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

power: Fix the mmi chip struct access issue in QC battery

Browse source 
If use QC battery as the "battery" supply, the sysfs nodes charger_rate
and age will have no way to access the mmi smbcharger chip struct, as
it can only obtain the QC battery supply driver data.

Mot-CRs-fixed: (CR)

Change-Id: I6388c1bd951ee3aa9288c8dda15602f72b275dd3
Signed-off-by: Yonghua Yan <yanyh2@motorola.com>
Reviewed-on: https://gerrit.mot.com/1346435
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Reviewed-by: Kenneth Kessler <kennykessler@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1355883
This commit is contained in:
Yonghua Yan 2019-04-30 22:58:35 +08:00
commit af37f4658f
1 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

33
drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c
View file

@ -67,6 +67,8 @@ static bool debug_enabled;
module_param(debug_enabled, bool, 0600);
MODULE_PARM_DESC(debug_enabled, "Enable debug for mmi smbcharger driver");
static struct smb_mmi_charger *this_chip = NULL;
#ifndef PM8150B_SUBTYPE
#define PM8150B_SUBTYPE PM855B_SUBTYPE
#endif
@ -3327,24 +3329,14 @@ static ssize_t charge_rate_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct power_supply *psy;
struct smb_mmi_charger *chip;
psy = dev_get_drvdata(dev);
if (psy &&
(strcmp(psy->desc->name, "battery") == 0))
chip = power_supply_get_drvdata(psy);
else {
pr_err("SMBMMI: Not Correct PSY\n");
if (!this_chip) {
pr_err("SMBMMI: mmi_chip is not initialized\n");
return 0;
}
if (!chip) {
pr_err("SMBMMI: Can't find mmi_chip\n");
return 0;
}
mmi_chrg_rate_check(chip);
mmi_chrg_rate_check(this_chip);
return scnprintf(buf, CHG_SHOW_MAX_SIZE, "%s\n",
charge_rate[chip->charger_rate]);
charge_rate[this_chip->charger_rate]);
}
static DEVICE_ATTR(charge_rate, S_IRUGO, charge_rate_show, NULL);
@ -3352,18 +3344,12 @@ static ssize_t age_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct power_supply *psy;
struct smb_mmi_charger *chip;
psy = dev_get_drvdata(dev);
if (psy &&
(strcmp(psy->desc->name, "battery") == 0))
chip = power_supply_get_drvdata(psy);
else {
pr_err("SMBMMI: Not Correct PSY\n");
if (!this_chip) {
pr_err("SMBMMI: mmi_chip is not initialized\n");
return 0;
}
return scnprintf(buf, CHG_SHOW_MAX_SIZE, "%d\n", chip->age);
return scnprintf(buf, CHG_SHOW_MAX_SIZE, "%d\n", this_chip->age);
}
static DEVICE_ATTR(age, S_IRUGO, age_show, NULL);
@ -3395,6 +3381,7 @@ static int smb_mmi_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, chip);
chip->suspended = 0;
chip->awake = false;
this_chip = chip;
device_init_wakeup(chip->dev, true);
smb_mmi_chg_config_init(chip);