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

Commit 6419147a 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: Disable secondary USB port for SDM845"

parents f1b15733 75d61a8b

arch/arm64/boot/dts/qcom/sdm845-670-usb-common.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ 
			snps,hird-threshold = /bits/ 8 <0x10>;

			snps,usb3_lpm_capable;

			usb-core-id = <1>;

			dr_mode = "host";

		};

	};
@@ -429,7 +430,8 @@ 
			 0x254 /* QUSB2PHY_TEST1 */

			 0x198 /* PLL_BIAS_CONTROL_2 */

			 0x228 /* QUSB2PHY_SQ_CTRL1 */

			 0x22c>; /* QUSB2PHY_SQ_CTRL2 */

			 0x22c /* QUSB2PHY_SQ_CTRL2 */

			 0x27c>; /* QUSB2PHY_DEBUG_CTRL1 */



		qcom,qusb-phy-init-seq =

			/* <value reg_offset> */

arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi

+0 −9
Original line number Diff line number Diff line
@@ -341,22 +341,13 @@ 
};



&usb1 {

	status = "okay";

	extcon = <&extcon_usb1>;

};



&qusb_phy1 {

	status = "okay";

};



&ext_5v_boost {

	status = "ok";

};



&usb_qmp_phy {

	status = "okay";

};



&pm8998_vadc {

	chan@83 {

		label = "vph_pwr";