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

Commit 42f1e0c9 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 PD PHY peripheral to pmi8998 on sdm845" into msm-4.9

parents c368dab3 af5edc8a

arch/arm64/boot/dts/qcom/pmi8998.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -205,6 +205,33 @@ 
			};

		};



		pmi8998_pdphy: qcom,usb-pdphy@1700 {

			compatible = "qcom,qpnp-pdphy";

			reg = <0x1700 0x100>;

			vdd-pdphy-supply = <&pm8998_l24>;

			vbus-supply = <&smb2_vbus>;

			vconn-supply = <&smb2_vconn>;

			interrupts = <0x2 0x17 0x0 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x1 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x2 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x3 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x4 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x5 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x6 IRQ_TYPE_EDGE_RISING>;



			interrupt-names = "sig-tx",

					  "sig-rx",

					  "msg-tx",

					  "msg-rx",

					  "msg-tx-failed",

					  "msg-tx-discarded",

					  "msg-rx-discarded";



			qcom,default-sink-caps = <5000 3000>, /* 5V @ 3A */

						 <9000 3000>, /* 9V @ 3A */

						 <12000 2250>; /* 12V @ 2.25A */

		};



		pmi8998_rradc: rradc@4500 {

			compatible = "qcom,rradc";

			reg = <0x4500 0x100>;

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
		qcom,usb-dbm = <&dbm_1p5>;

		qcom,dwc-usb3-msm-tx-fifo-size = <21288>;

		qcom,num-gsi-evt-buffs = <0x3>;

		extcon = <0>, <0>, <&eud>;

		extcon = <&pmi8998_pdphy>, <&pmi8998_pdphy>, <&eud>;



		clocks = <&clock_gcc GCC_USB30_PRIM_MASTER_CLK>,

			 <&clock_gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,