summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAnkit Sharma <ansharma@codeaurora.org>2017-03-07 18:31:23 +0530
committerAnkit Sharma <ansharma@codeaurora.org>2017-03-09 12:09:24 +0530
commit3dde7b3e01b673caec296d4e43249966dec21d0d (patch)
tree19c3c5019208b4bd0f91d128659a3451137d8468 /arch
parent1450b9c7daad7f365c9de0dfa45580618030ba1a (diff)
msm: qpnp-haptic: Add support for haptics on PM660
Update the driver to support PM660. PM660 add dedicated register for auto-resonance control and a few other changes to haptics configuration. CRs-Fixed: 2016588 Change-Id: Ia9d65bc0a1169b5cba1c122d50d49c8102ac79f5 Signed-off-by: Ankit Sharma <ansharma@codeaurora.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/qcom/msm-pm660.dtsi5
-rw-r--r--arch/arm/boot/dts/qcom/msm-pmi8998.dtsi1
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-pm660.dtsi b/arch/arm/boot/dts/qcom/msm-pm660.dtsi
index 9c4890a84a37..463d352f8791 100644
--- a/arch/arm/boot/dts/qcom/msm-pm660.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pm660.dtsi
@@ -607,6 +607,7 @@
interrupts = <0x1 0xc0 0x0 IRQ_TYPE_NONE>,
<0x1 0xc0 0x1 IRQ_TYPE_NONE>;
interrupt-names = "sc-irq", "play-irq";
+ qcom,pmic-revid = <&pm660_revid>;
qcom,actuator-type = "lra";
qcom,play-mode = "direct";
qcom,vmax-mv = <3200>;
@@ -619,9 +620,9 @@
qcom,brake-pattern = [03 03 00 00];
qcom,use-play-irq;
qcom,use-sc-irq;
- qcom,lra-high-z = "opt1";
+ qcom,lra-high-z = "opt0";
qcom,lra-auto-res-mode = "qwd";
- qcom,lra-res-cal-period = <4>;
+ qcom,lra-calibrate-at-eop = <0>;
qcom,correct-lra-drive-freq;
qcom,misc-trim-error-rc19p2-clk-reg-present;
};
diff --git a/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi b/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi
index c21c136907d4..f87792c3dabb 100644
--- a/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi
@@ -631,6 +631,7 @@
interrupts = <0x3 0xc0 0x0 IRQ_TYPE_NONE>,
<0x3 0xc0 0x1 IRQ_TYPE_NONE>;
interrupt-names = "sc-irq", "play-irq";
+ qcom,pmic-revid = <&pmi8998_revid>;
qcom,actuator-type = "lra";
qcom,play-mode = "direct";
qcom,vmax-mv = <3200>;