Merge "ARM: dts: msm: Correct the haptics DT properties for PMI8950"

		};

		pmi_haptic: qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

			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 = <&pmi8950_revid>;

			vcc_pon-supply = <&pon_perph_reg>;

			qcom,play-mode = "direct";

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

			qcom,actuator-type = "erm";

			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>;

		};