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

Commit 8393866d 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 the haptics DT properties for PMI8937"

parents 5bed7228 9a9a6b41

arch/arm64/boot/dts/qcom/msm8917-qrd-overlay.dts

+0 −9
Original line number Diff line number Diff line
@@ -110,13 +110,4 @@ 
		qcom,key-codes = <139 172 158>;

		qcom,y-offset = <0>;

	};



	led_flash0: qcom,camera-flash {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-type = <1>;

		qcom,flash-source = <&pmi8937_flash0>;

		qcom,torch-source = <&pmi8937_torch0>;

		qcom,switch-source = <&pmi8937_switch>;

	};

};

arch/arm64/boot/dts/qcom/msm8917-qrd.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <dt-bindings/clock/msm-clocks-8952.h>

#include "msm8917-camera-sensor-qrd.dtsi"

#include "msm8937-mdss-panels.dtsi"

#include "msm8917-pmi8937.dtsi"



&blsp1_uart2 {

	status = "ok";

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

+9 −13
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
 */



#include <dt-bindings/msm/power-on.h>

#include <dt-bindings/spmi/spmi.h>

#include <dt-bindings/interrupt-controller/irq.h>



&spmi_bus {
@@ -491,34 +493,28 @@ 
			};

		};



		pmi_haptic: qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

		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 = "sc-irq", "play-irq";

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

			qcom,pmic-revid = <&pmi8937_revid>;

			vcc_pon-supply = <&pon_perph_reg>;

			qcom,play-mode = "direct";

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

			qcom,actuator-type = "lra";

			qcom,actuator-type = <0>;

			qcom,wave-shape = "square";

			qcom,vmax-mv = <2000>;

			qcom,ilim-ma = <800>;

			qcom,sc-deb-cycles = <8>;

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

			qcom,en-brake;

			qcom,brake-pattern = [03 03 00 00];

			qcom,use-play-irq;

			qcom,use-sc-irq;

			qcom,wave-samples = [3e 3e 3e 3e 3e 3e 3e 3e];

			qcom,brake-pattern = <0x3 0x3 0x0 0x0>;

			qcom,wave-samples =  <0x3e 0x3e 0x3e 0x3e 0x3e

							0x3e 0x3e 0x3e>;

			qcom,wave-rep-cnt = <1>;

			qcom,wave-samp-rep-cnt = <1>;

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

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

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

			qcom,correct-lra-drive-freq;

			qcom,misc-trim-error-rc19p2-clk-reg-present;

		};

	};

};