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

Commit 29a2e395 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: Add support for HVDCP"

parents 81921f56 7c2f2dda

drivers/usb/dwc3/dwc3-msm.c

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2335,6 +2335,7 @@ static int dwc3_msm_power_set_property_usb(struct power_supply *psy, 
			mdwc->charger.chg_type = DWC3_SDP_CHARGER;

			break;

		case POWER_SUPPLY_TYPE_USB_DCP:

		case POWER_SUPPLY_TYPE_USB_HVDCP:

			mdwc->charger.chg_type = DWC3_DCP_CHARGER;

			break;

		case POWER_SUPPLY_TYPE_USB_CDP: