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

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

Merge "USB: phy-msm-usb: mark floated charger as DCP type"

parents dd1e9e5a 63cff18f

drivers/usb/phy/phy-msm-usb.c

+2 −1
Original line number Diff line number Diff line
@@ -1342,7 +1342,8 @@ static int msm_otg_notify_chg_type(struct msm_otg *motg) 
	else if (motg->chg_type == USB_CDP_CHARGER)

		charger_type = POWER_SUPPLY_TYPE_USB_CDP;

	else if (motg->chg_type == USB_DCP_CHARGER ||

			motg->chg_type == USB_PROPRIETARY_CHARGER)

			motg->chg_type == USB_PROPRIETARY_CHARGER ||

			motg->chg_type == USB_FLOATED_CHARGER)

		charger_type = POWER_SUPPLY_TYPE_USB_DCP;

	else if ((motg->chg_type == USB_ACA_DOCK_CHARGER ||

		motg->chg_type == USB_ACA_A_CHARGER ||