From b21bb6a038482a9fcb2a730ed485292be210a815 Mon Sep 17 00:00:00 2001 From: Jack Pham Date: Tue, 26 Nov 2019 11:19:33 -0800 Subject: [PATCH] ARM: dts: msm: Update USB interrupt trigger types on Lahaina Change "dp_hs_phy_irq" and "dm_hs_phy_irq" IRQ trigger types to rising-edge instead of dual-edge in order to match with what the driver is requesting. This avoids a error produced when the driver is removed and reprobed as the kernel IRQ subsystem will have updated the trigger type to the driver's request type, and on the subsequent probe results in the following errors when IRQ mapping is performed due to the flags mismatch: [ 885.423166] irq: type mismatch, failed to map hwirq-14 for interrupt-controller@b220000! [ 885.439468] irq: type mismatch, failed to map hwirq-15 for interrupt-controller@b220000! Change-Id: I9c8ac57691072a09276473b5a66f330e5bd94a8b --- qcom/lahaina-usb.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qcom/lahaina-usb.dtsi b/qcom/lahaina-usb.dtsi index 1d39f56e176c..be0cf0ff0f22 100644 --- a/qcom/lahaina-usb.dtsi +++ b/qcom/lahaina-usb.dtsi @@ -12,10 +12,10 @@ ranges; dma-ranges; - interrupts-extended = <&pdc 14 IRQ_TYPE_EDGE_BOTH>, + interrupts-extended = <&pdc 14 IRQ_TYPE_EDGE_RISING>, <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>, <&pdc 17 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 15 IRQ_TYPE_EDGE_BOTH>; + <&pdc 15 IRQ_TYPE_EDGE_RISING>; interrupt-names = "dp_hs_phy_irq", "pwr_event_irq", "ss_phy_irq", "dm_hs_phy_irq"; qcom,use-pdc-interrupts; @@ -105,10 +105,10 @@ ranges; dma-ranges; - interrupts-extended = <&pdc 12 IRQ_TYPE_EDGE_BOTH>, + interrupts-extended = <&pdc 12 IRQ_TYPE_EDGE_RISING>, <&intc GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>, <&pdc 16 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 13 IRQ_TYPE_EDGE_BOTH>; + <&pdc 13 IRQ_TYPE_EDGE_RISING>; interrupt-names = "dp_hs_phy_irq", "pwr_event_irq", "ss_phy_irq", "dm_hs_phy_irq"; qcom,use-pdc-interrupts;