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

Commit 1959eb9b 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: add vendor prefix against used dwc3 flags"

parents 307593ca bceadca1

Documentation/devicetree/bindings/usb/dwc3.txt

+4 −3
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ Required properties: 


Optional properties:

 - tx-fifo-resize: determines if the FIFO *has* to be reallocated.

 - host-only-mode: if present then dwc3 should be run in HOST only mode.

 - nominal-elastic-buffer: When set, the nominal elastic buffer setting

 - snps,host-only-mode: if present then dwc3 should be run in HOST only mode.

 - snps,nominal-elastic-buffer: When set, the nominal elastic buffer setting

	is used. By default, the half-full setting is used.

 - core_reset_after_phy_init: If present, PHY reset and initialization is

 - snps,core-reset-after-phy-init: If present, PHY reset and initialization is

   performed before core reset.

 - snps,hsphy-auto-suspend-disable: If present, auto suspend feature is not enabled with hsusb phy.
@@ -29,4 +29,5 @@ dwc3@4a030000 { 
	interrupt-names = "irq", "otg_irq";

	usb-phy = <&usb2_phy>, <&usb3,phy>;

	tx-fifo-resize;

	snps,hsphy-auto-suspend-disable;

};

arch/arm/boot/dts/qcom/apq8074-dragonboard.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ 
	qcom,charging-disabled;

	vbus_dwc3-supply = <0>;

	dwc3@f9200000 {

		host-only-mode;

		snps,host-only-mode;

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -2726,7 +2726,7 @@ 
				interrupts = <0 258 4>, <0 262 4>;

				interrupt-names = "irq", "otg_irq";

				usb-phy = <&hsphy1>, <&ssphy1>;

				host-only-mode;

				snps,host-only-mode;

			};

		};

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -498,8 +498,8 @@ 
				interrupts = <0 131 0>, <0 179 0>;

				interrupt-names = "irq", "otg_irq";

				usb-phy = <&hsphy0>, <&ssphy0>;

				nominal-elastic-buffer;

				core_reset_after_phy_init;

				snps,nominal-elastic-buffer;

				snps,core-reset-after-phy-init;

				snps,hsphy-auto-suspend-disable;

		};

        };

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

+1 −1
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ 
			interrupt-names = "irq", "otg_irq";

			usb-phy = <&hsphy>, <&ssphy>;

			tx-fifo-resize;

			host-only-mode;

			snps,host-only-mode;

		};

	};