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

Commit d8d1b768 authored Jun 08, 2016 by Himanshu Aggarwal

ARM: dts: msm: configure correct actuator type for 8937/8917 QRD



8937/8917 QRDs use ERM actuator. However the top level haptics
DT node defined in the PMI8950/PMI8937 DT includes a few
DT properties that are not needed for ERM actuators. Remove
these properties from the haptics DT node for QRD.

CRs-Fixed: 1024697
Change-Id: If4151d472b65e9456d0018ce9eb18763bd06e6ed
Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>

parent cc957303

arch/arm/boot/dts/qcom/msm8917-pmi8937-qrd-sku5.dtsi

+5 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,11 @@
		&pmi_haptic {
		status = "okay";
		qcom,actuator-type = "erm";
		/delete-property/ qcom,lra-auto-res-mode;
		/delete-property/ qcom,lra-high-z;
		/delete-property/ qcom,lra-res-cal-period;
		/delete-property/ qcom,correct-lra-drive-freq;
		/delete-property/ qcom,misc-trim-error-rc19p2-clk-reg-present;
		};

		&flash_led {

arch/arm/boot/dts/qcom/msm8917-qgp-tmo.dtsi

+10 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,16 @@
		#include "msm8917-qrd.dtsi"
		#include "msm8937-mdss-panels.dtsi"

		&pmi_haptic {
		status = "okay";
		qcom,actuator-type = "erm";
		/delete-property/ qcom,lra-auto-res-mode;
		/delete-property/ qcom,lra-high-z;
		/delete-property/ qcom,lra-res-cal-period;
		/delete-property/ qcom,correct-lra-drive-freq;
		/delete-property/ qcom,misc-trim-error-rc19p2-clk-reg-present;
		};

		&flash_led {
		/delete-node/ qcom,flash_1;
		/delete-node/ qcom,torch_1;

arch/arm/boot/dts/qcom/msm8937-pmi8937-qrd-sku2.dtsi

+5 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,11 @@
		&pmi_haptic {
		status = "okay";
		qcom,actuator-type = "erm";
		/delete-property/ qcom,lra-auto-res-mode;
		/delete-property/ qcom,lra-high-z;
		/delete-property/ qcom,lra-res-cal-period;
		/delete-property/ qcom,correct-lra-drive-freq;
		/delete-property/ qcom,misc-trim-error-rc19p2-clk-reg-present;
		};

		&mdss_dsi1 {