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

Commit be5f1a3f 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: Use correct HS PHY IRQ for msm8996 secondary USB"

parents 617e0369 40ed23ed

arch/arm/boot/dts/qcom/msm8996-pm.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ 
		qcom,gic-parent = <&intc>;

		qcom,gic-map = <2 216>, /* tsens_upper_lower_int */

			<79 379>,   /* qusb2phy_dmse_hv_prim */

			<80 384>,   /* qusb2phy_dmse_hv_sec */

			<52 275>,   /* qmp_usb3_lfps_rxterm_irq */

			<87 358>,   /* ee0_krait_hlos_spmi_periph_irq */

			<0xff 16>,  /* APCj_qgicdrCpu0HwFaultIrptReq */

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

+1 −1
Original line number Diff line number Diff line
@@ -1979,7 +1979,7 @@ 
		ranges;

		status = "disabled";



		interrupts = <0 139 0>, <0 140 0>;

		interrupts = <0 352 0>, <0 140 0>;

		interrupt-names = "hs_phy_irq", "pwr_event_irq";



		qcom,msm-bus,name = "usb-hs";