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

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

Merge "power: smbcharger: Use Wipower charger type for dc charging path"

parents 795a1a3c 91a609cd

Documentation/devicetree/bindings/power/qpnp-smbcharger.txt

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ Optional Properties: 
				the qcom,charging-timeout-mins property must

				be specified in order for this to take effect.

- qcom,dc-psy-type		The type of charger connected to the DC path.

				Can be "Mains" or "Wireless"

				Can be "Mains", "Wireless" or "Wipower"

- qcom,dc-psy-ma		The current in mA dc path can support. Must be

				specified if dc-psy-type is specified. Valid

				range 300mA to 2000mA.

drivers/power/qpnp-smbcharger.c

+2 −0
Original line number Diff line number Diff line
@@ -3571,6 +3571,8 @@ static int smb_parse_dt(struct smbchg_chip *chip) 
			chip->dc_psy_type = POWER_SUPPLY_TYPE_MAINS;

		else if (strcmp(dc_psy_type, "Wireless") == 0)

			chip->dc_psy_type = POWER_SUPPLY_TYPE_WIRELESS;

		else if (strcmp(dc_psy_type, "Wipower") == 0)

			chip->dc_psy_type = POWER_SUPPLY_TYPE_WIPOWER;

	}

	if (chip->dc_psy_type != -EINVAL) {

		OF_PROP_READ(chip, chip->dc_target_current_ma,