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

Commit d9eba7de 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: Fix the actuator-type for PMI8950/40 haptics"

parents bf760df2 2340897f

arch/arm64/boot/dts/qcom/apq8053-lite-dragon.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -466,7 +466,6 @@ 


&pmi_haptic{

	status = "disabled";

	qcom,actuator-type = "lra";

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

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

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

arch/arm64/boot/dts/qcom/apq8053-lite-som.dts

+0 −1
Original line number Diff line number Diff line
@@ -370,7 +370,6 @@ 


&pmi_haptic{

	status = "disabled";

	qcom,actuator-type = "lra";

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

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

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

arch/arm64/boot/dts/qcom/msm8917-cdp-mirror-lake-touch.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ 
};



&pmi_haptic{

	qcom,actuator-type = "lra";

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

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

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

arch/arm64/boot/dts/qcom/pmi8940.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ 
			vcc_pon-supply = <&pon_perph_reg>;

			qcom,play-mode = "direct";

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

			qcom,actuator-type = "lra";

			qcom,actuator-type = <0>;

			qcom,wave-shape = "square";

			qcom,vmax-mv = <2000>;

			qcom,ilim-ma = <800>;