Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e1be1a2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "smb1351: add MODEL_NAME property in parallel power_supply"

parents 627a89f9 50cd6e03

drivers/power/supply/qcom/smb1351-charger.c

+4 −0
Original line number Diff line number Diff line
@@ -1417,6 +1417,7 @@ static enum power_supply_property smb1351_parallel_properties[] = { 
	POWER_SUPPLY_PROP_CHARGE_TYPE,

	POWER_SUPPLY_PROP_PARALLEL_MODE,

	POWER_SUPPLY_PROP_INPUT_SUSPEND,

	POWER_SUPPLY_PROP_MODEL_NAME,

};



static int smb1351_parallel_set_chg_suspend(struct smb1351_charger *chip,
@@ -1711,6 +1712,9 @@ static int smb1351_parallel_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_INPUT_SUSPEND:

		val->intval = chip->parallel_charger_suspended;

		break;

	case POWER_SUPPLY_PROP_MODEL_NAME:

		val->strval = "smb1351";

		break;

	default:

		return -EINVAL;

	}