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

Commit 80500274 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: add PON regulator support for PMI8950 haptics"

parents c2cd23ca eb555433

arch/arm64/boot/dts/qcom/msm8953-mtp.dts

+7 −0
Original line number Diff line number Diff line
@@ -37,6 +37,13 @@ 
	qcom,battery-data = <&mtp_batterydata>;

};



&pmi_haptic{

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

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

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

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

};



&qpnp_smbcharger {

	qcom,battery-data = <&mtp_batterydata>;

	qcom,chg-led-sw-controls;

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

+3 −1
Original line number Diff line number Diff line
@@ -587,13 +587,15 @@ 
			};

		};



		pmi_haptic: qcom,haptic@c000 {

		pmi_haptic: qcom,haptics@c000 {

			compatible = "qcom,qpnp-haptics";

			reg = <0xc000 0x100>;

			interrupts = <0x3 0xc0 0x0 IRQ_TYPE_EDGE_BOTH>,

					<0x3 0xc0 0x1 IRQ_TYPE_EDGE_BOTH>;

			interrupt-names = "hap-sc-irq", "hap-play-irq";

			qcom,pmic-revid = <&pmi8950_revid>;

			vcc_pon-supply = <&pon_perph_reg>;

			qcom,int-pwm-freq-khz = <505>;

			qcom,play-mode = "direct";

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

			qcom,actuator-type = <0>;