Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73f8a452 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: configure LRA as the default actuator type for MSM8940"

parents aa0b2d74 f5efc4da

arch/arm/boot/dts/qcom/msm8937-cdp.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -130,6 +130,11 @@ 
&pmi_haptic{

	qcom,wave-play-rate-us = <4165>;

	qcom,actuator-type = "lra";

	qcom,lra-auto-res-mode="qwd";

	qcom,lra-high-z="opt1";

	qcom,lra-res-cal-period = <4>;

	qcom,correct-lra-drive-freq;

	qcom,misc-trim-error-rc19p2-clk-reg-present;

};



&sdhc_1 {

arch/arm/boot/dts/qcom/msm8937-mtp.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -78,6 +78,11 @@ 
&pmi_haptic{

	qcom,wave-play-rate-us = <4165>;

	qcom,actuator-type = "lra";

	qcom,lra-auto-res-mode="qwd";

	qcom,lra-high-z="opt1";

	qcom,lra-res-cal-period = <4>;

	qcom,correct-lra-drive-freq;

	qcom,misc-trim-error-rc19p2-clk-reg-present;

};



&spi_3 { /* BLSP1 QUP3 */