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

Commit 38353849 authored Jun 17, 2016 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jun 17, 2016

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

parents 1f596c8d d8d1b768

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 {