Merge "ARM: dts: msm: Update haptics configuration for SM8150 platforms"

This commit is contained in:
qctecmdr Service 2018-08-25 09:20:43 -07:00 committed by Gerrit - the friendly Code Review server
commit 0380ccaba3
2 changed files with 51 additions and 3 deletions

View File

@ -479,7 +479,7 @@
<0x3 0xc0 0x1 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "hap-sc-irq", "hap-play-irq";
qcom,actuator-type = "lra";
qcom,vmax-mv = <3600>;
qcom,vmax-mv = <3400>;
qcom,play-rate-us = <6667>;
qcom,lra-resonance-sig-shape = "sine";
qcom,lra-auto-resonance-mode = "qwd";
@ -488,38 +488,54 @@
wf_0 {
/* CLICK */
qcom,effect-id = <0>;
qcom,wf-vmax-mv = <3600>;
qcom,wf-pattern = [3e 3e 3e];
qcom,wf-play-rate-us = <6667>;
qcom,wf-brake-pattern = [01 00 00 00];
qcom,lra-auto-resonance-disable;
};
wf_1 {
/* DOUBLE CLICK */
qcom,effect-id = <1>;
qcom,wf-pattern = [7e 7e 02 02 02 02 7e 7e];
qcom,wf-vmax-mv = <3600>;
qcom,wf-pattern = [7e 7e 02 02 02 02 02 02];
qcom,wf-play-rate-us = <7143>;
qcom,wf-repeat-count = <2>;
qcom,wf-s-repeat-count = <1>;
qcom,lra-auto-resonance-disable;
};
wf_2 {
/* TICK */
qcom,effect-id = <2>;
qcom,wf-vmax-mv = <3600>;
qcom,wf-pattern = [7e 7e];
qcom,wf-play-rate-us = <4000>;
qcom,lra-auto-resonance-disable;
};
wf_3 {
/* THUD */
qcom,effect-id = <3>;
qcom,wf-vmax-mv = <3600>;
qcom,wf-pattern = [7e 7e 7e];
qcom,wf-play-rate-us = <5714>;
qcom,wf-play-rate-us = <6667>;
qcom,lra-auto-resonance-disable;
};
wf_4 {
/* POP */
qcom,effect-id = <4>;
qcom,wf-vmax-mv = <3600>;
qcom,wf-pattern = [7e 7e];
qcom,wf-play-rate-us = <5000>;
qcom,lra-auto-resonance-disable;
};
wf_5 {
/* HEAVY CLICK */
qcom,effect-id = <5>;
qcom,wf-vmax-mv = <3600>;
qcom,wf-pattern = [7e 7e 7e];
qcom,wf-play-rate-us = <6667>;
qcom,wf-brake-pattern = [03 00 00 00];
qcom,lra-auto-resonance-disable;
};
};
};

View File

@ -521,6 +521,38 @@
status = "ok";
};
&pm8150b_haptics {
qcom,vmax-mv = <2545>;
qcom,play-rate-us = <4255>;
wf_0 {
/* CLICK */
qcom,wf-pattern = [3e 3e 3e 3e];
qcom,wf-play-rate-us = <4255>;
};
wf_1 {
/* DOUBLE CLICK */
qcom,wf-play-rate-us = <7143>;
};
wf_2 {
/* TICK */
qcom,wf-play-rate-us = <4000>;
};
wf_3 {
/* THUD */
qcom,wf-pattern = [7e 7e 7e 7e];
qcom,wf-play-rate-us = <4255>;
};
wf_4 {
/* POP */
qcom,wf-play-rate-us = <5000>;
};
wf_5 {
/* HEAVY CLICK */
qcom,wf-pattern = [7e 7e 7e 7e];
qcom,wf-play-rate-us = <4255>;
};
};
&pm8150b_charger {
qcom,sec-charger-config = <1>;
qcom,auto-recharge-soc = <98>;