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

Commit 4f98f918 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: Correct Haptics Play rate for MSM8937"

parents 352f324a 970dbdea

arch/arm/boot/dts/qcom/msm-pmi8937.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ 
			};

		};



		pmi8937_haptic: qcom,haptic@c000 {

		pmi_haptic: qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x3 0xc0 0x0>,

arch/arm/boot/dts/qcom/msm-pmi8950.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ 
			};

		};



		pmi8950_haptic: qcom,haptic@c000 {

		pmi_haptic: qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x3 0xc0 0x0>,

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

+4 −0
Original line number Diff line number Diff line
@@ -116,6 +116,10 @@ 
	status = "ok";

};



&pmi_haptic{

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

};



&sdhc_1 {

	/* device core power supply */

	vdd-supply = <&pm8937_l8>;

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

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ 
	status = "ok";

};



&pmi_haptic{

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

};



&spi_3 { /* BLSP1 QUP3 */

	status = "ok";

	maxim_sti@0 {

arch/arm/boot/dts/qcom/msm8952-qrd-skum.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 
	};

};



&pmi8950_haptic {

&pmi_haptic {

	qcom,vmax-mv = <3300>;

};