diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-12 12:47:39 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-12 12:47:39 -0700 |
| commit | d9fbe4b9210bcf0b7553d224f1c7390c15b91022 (patch) | |
| tree | ea7e568595a0b7453fbac6b43aceb340d4e5f7ce | |
| parent | 1e6e80aa0e39a3035da3dc4eeb193156f39439dd (diff) | |
| parent | 0fd1ce18079635d26a8b6e65c2f55f78f13a91a6 (diff) | |
Merge "ARM: dts: msm: Remove WLED short circuit properties for PM660"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-pm660l.dtsi | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-pm660l.dtsi b/arch/arm/boot/dts/qcom/msm-pm660l.dtsi index 0f18ba5c94c7..9cd117ce4e0c 100644 --- a/arch/arm/boot/dts/qcom/msm-pm660l.dtsi +++ b/arch/arm/boot/dts/qcom/msm-pm660l.dtsi @@ -250,9 +250,8 @@ <0xd900 0x100>; reg-names = "qpnp-wled-ctrl-base", "qpnp-wled-sink-base"; - interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_RISING>, - <0x3 0xd8 0x2 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "ovp-irq", "sc-irq"; + interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "ovp-irq"; linux,name = "wled"; linux,default-trigger = "bkl-trigger"; qcom,fdbk-output = "auto"; @@ -268,7 +267,6 @@ qcom,fs-curr-ua = <25000>; qcom,cons-sync-write-delay-us = <1000>; qcom,led-strings-list = [00 01 02]; - qcom,en-ext-pfet-sc-pro; qcom,loop-auto-gm-en; qcom,pmic-revid = <&pm660l_revid>; status = "ok"; |