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

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

Merge "phy: msm: usb: Remove dedicated charger type support"

parents 69f2c1de 2dc3339c

Documentation/devicetree/bindings/usb/msm-hsusb.txt

+0 −8
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ Optional properties : 
- qcom,hsusb-l1-supported: If present, the device supports l1 (Link power

	management).

- qcom,no-selective-suspend: If present selective suspend is disabled on hub ports.

- qcom,hsusb-otg-mpm-dpsehv-int: If present, indicates mpm interrupt to be

	configured for detection of dp line transition during VDD minimization.

- qcom,hsusb-otg-mpm-dmsehv-int: If present, indicates mpm interrupt to be

	configured for detection of dm line transition during VDD minimization.

- pinctrl-names : This should be defined if a target uses gpio and pinctrl framework.

  See "pinctrl" in Documentation/devicetree/bindings/pinctrl/msm-pinctrl.txt.

  It should specify the names of the configs that pinctrl can install in driver
@@ -175,8 +171,6 @@ Optional properties : 
	devicetree/bindings/usb/android-dev.txt for details about "streaming-func" property.

- qcom,axi-prefetch-enable: If present, AXI64 interface will be used for transferring data

       to/from DDR by controller.

- qcom,enable-sdp-typec-current-limit: Indicates whether type-c current for SDP CHARGER to

	be limited.

- qcom,enable-phy-id-pullup: If present, PHY can keep D+ pull-up resistor on USB ID line

	during cable disconnect.

- qcom,max-svs-sysclk-rate: Indicates system clock frequency voted by driver in
@@ -220,8 +214,6 @@ Example HSUSB OTG controller device node : 
                HSUSB_3p3-supply = <&pm8226_l20>;

		qcom,vdd-voltage-level = <1 5 7>;

		qcom,dp-manual-pullup;

		qcom,hsusb-otg-mpm-dpsehv-int = <49>;

		qcom,hsusb-otg-mpm-dmsehv-int = <58>;

		qcom,max-nominal-sysclk-rate = <133330000>;

		qcom,max-svs-sysclk-rate = <100000000>;

		qcom,pm-qos-latency = <59>;

drivers/usb/gadget/ci13xxx_udc.c

+15 −0
Original line number Diff line number Diff line
@@ -3841,6 +3841,7 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev, 
			(unsigned long) mEp);

	}



	arch_setup_dma_ops(&udc->gadget.dev, 0, DMA_BIT_MASK(32), NULL, false);

	for (i = 0; i < hw_ep_max/2; i++) {

		for (j = RX; j <= TX; j++) {

			int k = i + j * hw_ep_max/2;
@@ -3855,6 +3856,20 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev, 


			mEp->ep.name      = mEp->name;

			mEp->ep.ops       = &usb_ep_ops;



			if (i == 0) {

				mEp->ep.caps.type_control = true;

			} else {

				mEp->ep.caps.type_iso = true;

				mEp->ep.caps.type_bulk = true;

				mEp->ep.caps.type_int = true;

			}



			if (j == TX)

				mEp->ep.caps.dir_in = true;

			else

				mEp->ep.caps.dir_out = true;



			usb_ep_set_maxpacket_limit(&mEp->ep,

				k ? USHRT_MAX : CTRL_PAYLOAD_MAX);

drivers/usb/gadget/udc/core.c

+4 −0
Original line number Diff line number Diff line
@@ -1172,6 +1172,10 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget, 
	INIT_WORK(&gadget->work, usb_gadget_state_work);

	gadget->dev.parent = parent;



	dma_set_coherent_mask(&gadget->dev, parent->coherent_dma_mask);

	gadget->dev.dma_parms = parent->dma_parms;

	gadget->dev.dma_mask = parent->dma_mask;



	if (release)

		gadget->dev.release = release;

	else