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

Commit 02344e85 authored by Jack Pham's avatar Jack Pham
Browse files

ARM: dts: msm: Fix USB interrupt-map property for MSM8996 ADP 



The length of interrupt-map property depends on the address-cells and
interrupt-cells properties of the interrupt controller referred to by
the phandle. The size of the address-cells property was changed in
commit c51ea2bb ("ARM: dts: msm: Add GIC ITS extensions for 8996").

The &usb3 node in the MSM8996 Agave ADP device tree uses interrupt-map
to allow for a combination of GIC and SPMI interrupts. Therefore
the GIC entries need to be updated to the new format. Also update
the correct IRQ numbers and add the missing ss_phy_irq to sync up
with the msm8996 SOC DT definition.

Change-Id: I802b99ef32bae9484d948a7fe34ca7754f8c5f82
Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
parent 9da4ddc1

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+7 −5
Original line number Diff line number Diff line
@@ -802,13 +802,15 @@ 


&usb3 {

	interrupt-parent = <&usb3>;

	interrupts = <0 1 2>;

	interrupts = <0 1 2 3>;

	#interrupt-cells = <1>;

	interrupt-map-mask = <0x0 0xffffffff>;

	interrupt-map = <0x0 0 &intc 0 133 0

			 0x0 1 &intc 0 180 0

			 0x0 2 &spmi_bus 0x0 0x0 0x9 0x0>;

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

	interrupt-map = <0x0 0 &intc 0 0 347 0

			 0x0 1 &intc 0 0 243 0

			 0x0 2 &intc 0 0 180 0

			 0x0 3 &spmi_bus 0x0 0x0 0x9 0x0>;

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

				"pmic_id_irq";



	vbus_dwc3-supply = <&usb_otg_switch>;

	vdda33-supply = <&pm8994_l24>;