evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "qpnp-smb2: use real_type to convey WIPOWER type" into msm-4.4

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-20 01:16:50 -07:00 • committed by Gerrit - the friendly Code Review server
commit c72d0c4cec
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/power/supply/qcom/qpnp-smb2.c
View file

@ -783,6 +783,7 @@ static enum power_supply_property smb2_dc_props[] = {
POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_PRESENT,
POWER_SUPPLY_PROP_ONLINE, POWER_SUPPLY_PROP_ONLINE,
POWER_SUPPLY_PROP_CURRENT_MAX, POWER_SUPPLY_PROP_CURRENT_MAX,
POWER_SUPPLY_PROP_REAL_TYPE,
}; };
static int smb2_dc_get_prop(struct power_supply *psy, static int smb2_dc_get_prop(struct power_supply *psy,
@ -803,6 +804,9 @@ static int smb2_dc_get_prop(struct power_supply *psy,
case POWER_SUPPLY_PROP_CURRENT_MAX: case POWER_SUPPLY_PROP_CURRENT_MAX:
rc = smblib_get_prop_dc_current_max(chg, val); rc = smblib_get_prop_dc_current_max(chg, val);
break; break;
case POWER_SUPPLY_PROP_REAL_TYPE:
val->intval = POWER_SUPPLY_TYPE_WIPOWER;
break;
default: default:
return -EINVAL; return -EINVAL;
} }
@ -851,7 +855,7 @@ static int smb2_dc_prop_is_writeable(struct power_supply *psy,
static const struct power_supply_desc dc_psy_desc = { static const struct power_supply_desc dc_psy_desc = {
.name = "dc", .name = "dc",
.type = POWER_SUPPLY_TYPE_WIPOWER, .type = POWER_SUPPLY_TYPE_WIRELESS,
.properties = smb2_dc_props, .properties = smb2_dc_props,
.num_properties = ARRAY_SIZE(smb2_dc_props), .num_properties = ARRAY_SIZE(smb2_dc_props),
.get_property = smb2_dc_get_prop, .get_property = smb2_dc_get_prop,