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

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

Merge "power: smb1355: Define max FCC limit using property"

parents a3d838a4 f1ddaa28

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

+4 −0
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ static enum power_supply_property smb1355_parallel_props[] = { 
	POWER_SUPPLY_PROP_PARALLEL_MODE,

	POWER_SUPPLY_PROP_CONNECTOR_HEALTH,

	POWER_SUPPLY_PROP_PARALLEL_BATFET_MODE,

	POWER_SUPPLY_PROP_PARALLEL_FCC_MAX,

	POWER_SUPPLY_PROP_INPUT_CURRENT_LIMITED,

	POWER_SUPPLY_PROP_MIN_ICL,

	POWER_SUPPLY_PROP_CURRENT_MAX,
@@ -629,6 +630,9 @@ static int smb1355_parallel_get_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_MIN_ICL:

		val->intval = MIN_PARALLEL_ICL_UA;

		break;

	case POWER_SUPPLY_PROP_PARALLEL_FCC_MAX:

		val->intval = chip->max_fcc;

		break;

	default:

		pr_err_ratelimited("parallel psy get prop %d not supported\n",

			prop);