diff options
| author | Sriharsha Allenki <sallenki@codeaurora.org> | 2017-03-21 19:20:05 +0530 |
|---|---|---|
| committer | Sriharsha Allenki <sallenki@codeaurora.org> | 2017-03-27 10:40:21 +0530 |
| commit | 5fe5778d71a4e61e54c6c209dbaf36f4a7820514 (patch) | |
| tree | 49592bc856bd1c2f8a9a677a38a2064174e61806 | |
| parent | a2552776b9dfbb61c6979d4d6e3b4de33cf01065 (diff) | |
arm: boot: dts: Fix incorrect IRQ numbers for MSM8996 ADP
The interrupt numbers in the usb3 node of MSM8996 ADP dtsi
file mismatches with the msm8996 SOC dt file. Hence fix by
removing all the hs_phy_irq and pwr_event_irq from usb3 node
in MSM8996 ADP dtsi file.
Add extcon phandle to support extcon based VBUS and ID detection
for MSM8996 Automotive kernel v4.4.
Move the pmic_id_irq to usb_detect label to support ID detection
using extcon framework. The interrupts cell of pmic_id_irq
requires 4 attributes according to the updated interrupt-cells
in spmi_bus node.
Change-Id: I4c77efa923ac1ae4a1f55a6729738e48852c7c15
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi index f54ede157a66..d980db375adb 100644 --- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi @@ -895,9 +895,12 @@ asoc-codec-names = "msm-stub-codec.1"; }; - usb_detect { + usb_detect: usb_detect { compatible = "qcom,gpio-usbdetect"; - qcom,vbus-det-irq = <&pm8994_gpios 17 0>; + qcom,vbus-det-gpio = <&pm8994_gpios 17 0>; + interrupt-parent = <&spmi_bus>; + interrupts = <0x0 0x9 0x0 IRQ_TYPE_NONE>; + interrupt-names ="pmic_id_irq"; }; loopback1: qcom,msm-pcm-loopback-low-latency { @@ -1086,15 +1089,7 @@ }; &usb3 { - interrupt-parent = <&usb3>; - interrupts = <0 1 2>; - #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"; - + extcon = <&usb_detect>; vbus_dwc3-supply = <&usb_otg_switch>; vdda33-supply = <&pm8994_l24>; vdda18-supply = <&pm8994_l12>; |