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

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

Merge "ARM: dts: msm: Add secondary USB 3.0 controller to apq8084"

parents 6c0c774b 3c5b9ada

arch/arm/boot/dts/qti/apq8084-liquid.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -306,6 +306,18 @@ 
	qcom,charging-disabled;

};



&usb3_sec {

	status = "ok";

};



&hsphy1 {

	status = "ok";

};



&ssphy1 {

	status = "ok";

};



&pma8084_gpios {

	gpio@c000 { /* GPIO 1 */

		qcom,mode = <0>;

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

+48 −0
Original line number Diff line number Diff line
@@ -1806,6 +1806,31 @@ 
			tx-fifo-resize;

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

		};



		usb3_sec: qcom,ssusb@f9400000 {

			compatible = "qcom,dwc-usb3-msm";

			reg = <0xf9400000 0xfc000>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;

			interrupt-parent = <&intc>;

			interrupts = <0 261 4>;

			interrupt-names = "hs_phy_irq";

			USB3_GDSC-supply = <&gdsc_usb30_sec>;

			qcom,restore-sec-cfg-for-scm-dev-id = <10>;

			qcom,charging-disabled;

			status = "disabled";



			dwc3@f9400000 {

				compatible = "synopsys,dwc3";

				reg = <0xf9400000 0xfc000>;

				interrupt-parent = <&intc>;

				interrupts = <0 258 4>, <0 262 4>;

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

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

				host-only-mode;

			};

		};

	};



	android_usb@fe8050c8 {
@@ -1836,6 +1861,29 @@ 
		qti,vbus-valid-override;

	};



	hsphy1: hsphy@f94f8800 {

		compatible = "qti,usb-hsphy";

		reg = <0xf94f8800 0x3ff>;

		qti,hsphy-init = <0x00D191A4>;

		vdd-supply = <&pma8084_s1>;

		vdda18-supply = <&pma8084_l6>;

		vdda33-supply = <&pma8084_l24>;

		qti,vdd-voltage-level = <0 900000 1050000>;

		qti,ext-vbus-id;

		qti,primary-phy = <&hsphy0>;

		status = "disabled";

	};



	ssphy1: ssphy@f94f8800 {

		compatible = "qti,usb-ssphy";

		reg = <0xf94f8800 0x3ff>;

		vdd-supply = <&pma8084_s1>;

		vdda18-supply = <&pma8084_l6>;

		qti,vdd-voltage-level = <0 900000 1050000>;

		qti,primary-phy = <&ssphy0>;

		status = "disabled";

	};



	tsens: tsens@fc4a8000 {

		compatible = "qti,msm-tsens";

		reg = <0xfc4a8000 0x2000>,