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

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

Merge "USB: ANDROID: Implement dynamic pm_qos voting based on USB activity"

parents e94c822d e2bffa40

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

+9 −3
Original line number Diff line number Diff line
@@ -11,8 +11,14 @@ Required properties: 
Optional properties :

- reg  : offset and length of memory region that is used by device to

  update USB PID and serial numbers used by bootloader in DLOAD mode.

- qcom,android-usb-swfi-latency : value to be used by device to vote

  for DMA latency in microsecs.

- qcom,pm-qos-latency : This property must be a list of three integer values

  (perf, normal, sleep) where each value respresents DMA latency in microsecs.

  First value represents DMA latency to vote with pm_qos when back to back USB

  transfers are happening and it requires USB thoughput to be maximum.

  Second value represents value to vote when not many USB transfers are

  happening and it is OK to have higher DMA latency to save power.

  Third value represents DMA latency to vote when USB BUS is IDLE and absolutely

  no transfers are happening. It should allow transition to lowest power state.

- qcom,streaming-func : add list of usb function name. If mention usb function

  is being enable as part of USB composition, streaming mode is enable with

  usb device controller to get better throughput. NOTE: Inverted CRC and
@@ -30,7 +36,7 @@ Example Android USB device node : 
	android_usb@fc42b0c8 {

		compatible = "qcom,android-usb";

		reg = <0xfc42b0c8 0xc8>;

		qcom,android-usb-swfi-latency = <1>;

		qcom,pm-qos-latency = <2 1001 12701>;

		qcom,streaming-func = "rndis","mtp";

		qcom,android-usb-uicc-nluns = /bits/ 8 <1>;

		qcom,usb-core-id = <1>;

arch/arm/boot/dts/qcom/apq8084.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -4423,7 +4423,7 @@ 
	android_usb@fe8050c8 {

		compatible = "qcom,android-usb";

		reg = <0xfe8050c8 0xc8>;

		qcom,android-usb-swfi-latency = <1>;

		qcom,pm-qos-latency = <2 1001 30001>;

	};



	hsphy0: hsphy@f92f8800 {

arch/arm/boot/dts/qcom/fsm9900.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1584,7 +1584,7 @@ 


	android_usb@fe8050c8 {

		compatible = "qcom,android-usb";

		qcom,android-usb-swfi-latency = <1>;

		qcom,pm-qos-latency = <2 1001 30001>;

	};



	pcie0: qcom,pcie@fc520000 {

arch/arm/boot/dts/qcom/mdm9630.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ 
	android_usb@fe8050c8 {

		reg = <0xfe8050c8 0xc8>;

		compatible = "qcom,android-usb";

		qcom,android-usb-swfi-latency = <100>;

		qcom,pm-qos-latency = <101 2001 30001>;

	};



	hsphy0: hsphy@f92f8800 {

arch/arm/boot/dts/qcom/msm8226.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ 
	android_usb: android_usb@fe8050c8 {

		compatible = "qcom,android-usb";

		reg = <0xfe8050c8 0xc8>;

		qcom,android-usb-swfi-latency = <1>;

		qcom,pm-qos-latency = <2 1001 12701>;

		qcom,streaming-func = "rndis";

		qcom,android-usb-uicc-nluns = /bits/ 8 <1>;

	};