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

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

Merge "usb: dwc3-msm: Assign voltage_max after on charger identification"

parents bb807c2e 7db64649

drivers/usb/dwc3/dwc3-msm.c

+7 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ 
#define DWC3_HVDCP_CHG_MAX 1800

#define DWC3_WAKEUP_SRC_TIMEOUT 5000



#define MICRO_5V    5000000

#define MICRO_9V    9000000



/* AHB2PHY register offsets */

#define PERIPH_SS_AHB2PHY_TOP_CFG 0x10
@@ -2622,16 +2625,20 @@ static int dwc3_msm_power_set_property_usb(struct power_supply *psy, 
		switch (psy->type) {

		case POWER_SUPPLY_TYPE_USB:

			mdwc->chg_type = DWC3_SDP_CHARGER;

			mdwc->voltage_max = MICRO_5V;

			break;

		case POWER_SUPPLY_TYPE_USB_DCP:

			mdwc->chg_type = DWC3_DCP_CHARGER;

			mdwc->voltage_max = MICRO_5V;

			break;

		case POWER_SUPPLY_TYPE_USB_HVDCP:

			mdwc->chg_type = DWC3_DCP_CHARGER;

			mdwc->voltage_max = MICRO_9V;

			dwc3_msm_gadget_vbus_draw(mdwc, hvdcp_max_current);

			break;

		case POWER_SUPPLY_TYPE_USB_CDP:

			mdwc->chg_type = DWC3_CDP_CHARGER;

			mdwc->voltage_max = MICRO_5V;

			break;

		case POWER_SUPPLY_TYPE_USB_ACA:

			mdwc->chg_type = DWC3_PROPRIETARY_CHARGER;