aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSteve Pfetsch <spfetsch@google.com>2016-09-11 01:51:21 -0700
committerSteve Pfetsch <spfetsch@google.com>2016-09-12 10:51:37 -0700
commitf7a694ac5f224a9c901e9680fc90d88da24eb875 (patch)
treebdc1297ffdf62cf7bd6a7fc81ccd52b08c650616 /arch
parentd13bff5a11db40beaeae728d803fcedde8c090ae (diff)
arm64: dts: marlin/sailfish: add default values for haptics
Add default values for vmax-strong-mv, vmax-light-mv, and timeout-strong-threshold, which control the intensity of haptic feedback and the length of pulse necessary to trigger strong vibration. Bug: 31407746 Change-Id: Ie0e22fea2591343b3006d5f2171ea0a6936e6233
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/boot/dts/htc/msm8996-htc_marlin.dtsi3
-rw-r--r--arch/arm64/boot/dts/htc/msm8996-htc_sailfish.dtsi3
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/htc/msm8996-htc_marlin.dtsi b/arch/arm64/boot/dts/htc/msm8996-htc_marlin.dtsi
index de5b191f0d57..cc3c29e1781f 100644
--- a/arch/arm64/boot/dts/htc/msm8996-htc_marlin.dtsi
+++ b/arch/arm64/boot/dts/htc/msm8996-htc_marlin.dtsi
@@ -269,6 +269,9 @@
qcom,actuator-type = "lra";
qcom,wave-shape = "sine";
qcom,vmax-mv = <3596>;
+ qcom,vmax-strong-mv = <3596>;
+ qcom,vmax-light-mv = <1600>;
+ qcom,timeout-strong-threshold = <330>;
qcom,brake-pattern = [03 03 03 03];
};
diff --git a/arch/arm64/boot/dts/htc/msm8996-htc_sailfish.dtsi b/arch/arm64/boot/dts/htc/msm8996-htc_sailfish.dtsi
index 039d74b3c040..c178c7db0c5b 100644
--- a/arch/arm64/boot/dts/htc/msm8996-htc_sailfish.dtsi
+++ b/arch/arm64/boot/dts/htc/msm8996-htc_sailfish.dtsi
@@ -136,4 +136,7 @@
&pmi8994_haptics {
qcom,vmax-mv = <3132>;
+ qcom,vmax-strong-mv = <3132>;
+ qcom,vmax-light-mv = <2200>;
+ qcom,timeout-strong-threshold = <330>;
};