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

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

Merge changes I37032c83,I6c95902e,I1cc7444c into msm-4.14 

* changes:
  usb: composite: Adjust MaxPower based on enumerated USB speed
  defconfig: sdm855: Set max USB gadget vbus draw as 900mA
  ARM: dts: msm: configure SDM855 CDP as battery less platform
parents be9f99fa 97e233d2

arch/arm64/boot/dts/qcom/sdm855-cdp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -126,3 +126,7 @@ 
	qcom,string-cfg= <7>;

	status = "ok";

};



&pm855b_charger {

	qcom,batteryless-platform;

};

arch/arm64/configs/sdm855-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ CONFIG_USB_MSM_SSPHY_QMP=y 
CONFIG_MSM_HSUSB_PHY=y

CONFIG_DUAL_ROLE_USB_INTF=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_GADGET_VBUS_DRAW=900

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

arch/arm64/configs/sdm855_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ CONFIG_USB_MSM_SSPHY_QMP=y 
CONFIG_MSM_HSUSB_PHY=y

CONFIG_DUAL_ROLE_USB_INTF=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_GADGET_VBUS_DRAW=900

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

drivers/usb/gadget/composite.c

+3 −0
Original line number Diff line number Diff line
@@ -953,6 +953,9 @@ static int set_config(struct usb_composite_dev *cdev, 


	/* when we return, be sure our power usage is valid */

	power = c->MaxPower ? c->MaxPower : CONFIG_USB_GADGET_VBUS_DRAW;

	if (gadget->speed < USB_SPEED_SUPER)

		power = min(power, 500U);



done:

	usb_gadget_vbus_draw(gadget, power);

	if (result >= 0 && cdev->delayed_status)