summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSubbaraman Narayanamurthy <subbaram@codeaurora.org>2016-11-16 19:34:58 -0800
committerSubbaraman Narayanamurthy <subbaram@codeaurora.org>2016-12-05 20:54:03 -0800
commitfdacf60f19e9ce4326e61a9e5d5d1113d36b4525 (patch)
tree9e82817b8b8d00fd1951d0b575ede93b115ce847
parent126ffb778d3149bc63c5f86236866df435d39304 (diff)
ARM: dts: msm: Specify the WLED interrupts properly for pmi8998/pm2falcon
Currently, WLED short-circuit fault interrupt is not specified properly for pmi8998 and pm2falcon. Fix it. Also, specify the WLED over-voltage fault interrupt which is needed. Remove the address definitions of LAB and IBB which are not present in WLED driver anymore. Change-Id: Ia767b3f545fae04a08dc48c6d2bb5649b2ac4907 Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
-rw-r--r--arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi13
-rw-r--r--arch/arm/boot/dts/qcom/msm-pmi8998.dtsi15
2 files changed, 11 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi b/arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi
index 79883db10d06..d254fccec077 100644
--- a/arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi
@@ -222,15 +222,12 @@
pm2falcon_wled: qcom,leds@d800 {
compatible = "qcom,qpnp-wled";
reg = <0xd800 0x100>,
- <0xd900 0x100>,
- <0xdc00 0x100>,
- <0xde00 0x100>;
+ <0xd900 0x100>;
reg-names = "qpnp-wled-ctrl-base",
- "qpnp-wled-sink-base",
- "qpnp-wled-ibb-base",
- "qpnp-wled-lab-base";
- interrupts = <0x3 0xd8 0x2>;
- interrupt-names = "sc-irq";
+ "qpnp-wled-sink-base";
+ interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_BOTH>,
+ <0x3 0xd8 0x2 IRQ_TYPE_EDGE_BOTH>;
+ interrupt-names = "ovp-irq", "sc-irq";
linux,name = "wled";
linux,default-trigger = "bkl-trigger";
qcom,fdbk-output = "auto";
diff --git a/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi b/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi
index 725c129a28da..0dc9da9289e2 100644
--- a/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi
@@ -585,16 +585,12 @@
pmi8998_wled: qcom,leds@d800 {
compatible = "qcom,qpnp-wled";
reg = <0xd800 0x100>,
- <0xd900 0x100>,
- <0xdc00 0x100>,
- <0xde00 0x100>;
+ <0xd900 0x100>;
reg-names = "qpnp-wled-ctrl-base",
- "qpnp-wled-sink-base",
- "qpnp-wled-ibb-base",
- "qpnp-wled-lab-base";
- interrupts = <0x3 0xd8 0x2>;
- interrupt-names = "sc-irq";
- status = "okay";
+ "qpnp-wled-sink-base";
+ interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_BOTH>,
+ <0x3 0xd8 0x2 IRQ_TYPE_EDGE_BOTH>;
+ interrupt-names = "ovp-irq", "sc-irq";
linux,name = "wled";
linux,default-trigger = "bkl-trigger";
qcom,fdbk-output = "auto";
@@ -614,6 +610,7 @@
qcom,en-ext-pfet-sc-pro;
qcom,pmic-revid = <&pmi8998_revid>;
qcom,loop-auto-gm-en;
+ status = "okay";
};
pmi8998_haptics: qcom,haptic@c000 {