From d827d49e650bc3279b7e34b3aacce87c52db34cb Mon Sep 17 00:00:00 2001 From: Jack Pham Date: Fri, 11 Dec 2015 13:03:17 -0800 Subject: [PATCH] ARM: dts: msm: Use correct HS PHY IRQ for msm8996 secondary USB The driver change in commit 96f92e28e035 ("usb: dwc3-msm: Use hs phy and ss phy irq as wake up source") favored using hs_phy_irq over pwr_event_irq to wake up USB out of suspend. This change revealed the wrong IRQ was used for the secondary USB2s instance on msm8996. Use the correct HS PHY IRQ number which maps to QUSB. Map this IRQ to the corresponding MPM wakeup pin as well. Change-Id: Ibd56c10c3c96f88d964f7f5f8a0fe9b590c522c5 Signed-off-by: Jack Pham --- arch/arm64/boot/dts/qcom/msm8996-pm.dtsi | 1 + arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996-pm.dtsi b/arch/arm64/boot/dts/qcom/msm8996-pm.dtsi index 9334403ddb44..517f888f3b5a 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-pm.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996-pm.dtsi @@ -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 */ diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 63670a0787e5..7b52ca7c8e4c 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -1998,7 +1998,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";