diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-01 21:56:35 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-01 21:56:35 -0700 |
| commit | cf554e72cc15c763610960da41fc7ffeebd38320 (patch) | |
| tree | f612a446313a8ee98188e6ed0b4b09e7ba3efa8d | |
| parent | 25070b2a8d59aa5196dc6c4d618b37dc657aaca1 (diff) | |
| parent | ce47dd613490e2ec8f1ade16a2d65a1e9452fddd (diff) | |
Merge "ARM: dts: msm: Enable droop and fault detection for pmicobalt flash LED"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi b/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi index 1cce033743fc..75f3cd3e06ec 100644 --- a/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi @@ -634,11 +634,16 @@ status = "okay"; reg = <0xd300 0x100>; label = "flash"; - interrupts = <0x3 0xd3 0x3 IRQ_TYPE_EDGE_RISING>, - <0x3 0xd3 0x4 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "all-ramp-down-done-irq", + interrupts = <0x3 0xd3 0x0 IRQ_TYPE_EDGE_RISING>, + <0x3 0xd3 0x3 IRQ_TYPE_EDGE_RISING>, + <0x3 0xd3 0x4 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "led-fault-irq", + "all-ramp-down-done-irq", "all-ramp-up-done-irq"; qcom,hdrm-auto-mode; + qcom,short-circuit-det; + qcom,open-circuit-det; + qcom,vph-droop-det; qcom,isc-delay = <192>; pmicobalt_flash0: qcom,flash_0 { |