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

Commit 8b010914 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: enable pmic haptics for MTP and CDP"

parents b9668a1e a1bfb540

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

+2 −1
Original line number Diff line number Diff line
@@ -363,7 +363,8 @@ 
			qcom,led-strings-list = [00 01 02 03];

		};



		qcom,haptic@c000 {

		pmi8994_haptics: qcom,haptic@c000 {

			status = "disabled";

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x3 0xc0 0x0>,

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

+4 −0
Original line number Diff line number Diff line
@@ -615,3 +615,7 @@ 
		interrupt-names = "silabs_fm_int";

	};

};



&pmi8994_haptics {

	status = "okay";

};

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

+4 −0
Original line number Diff line number Diff line
@@ -633,3 +633,7 @@ 
&pmi8994_fg {

	qcom,battery-data = <&mtp_batterydata>;

};



&pmi8994_haptics {

	status = "okay";

};