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

Commit 694c726c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: qpnp-haptic: Add support for haptics on PM660"

parents 2f41626e 2e676147

Documentation/devicetree/bindings/platform/msm/qpnp-haptic.txt

+9 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ pwm(pulse width modulation) and audio. 
Required Properties:

 - compatible: must be "qcom,qpnp-haptic"

 - reg: address of device

 - qcom,pmic-revid : phandle to fetch PMIC revid

 - qcom,actuator-type: must be one of "erm" or "lra"

 - qcom,play-mode : must be one of "buffer", "direct", "pwm" or "audio"
@@ -63,7 +64,13 @@ Optional properties when qcom,actuator-type is "lra" 
			"max-qwd" : Maximum QWD

			"zxd-eop" : ZXD + End of pattern (This is the Default)

 - qcom,lra-high-z : High Z configuration for auto resonance. Possible string values are

			"none", "opt1", "opt2" and "opt3" (default)

			"none", "opt1", "opt2" and "opt3" (default). For PM660,

			"opt0" is valid value for 1 LRA period.

 - qcom,lra-qwd-drive-duration : Drive duration of LRA in QWD mode for PM660.

			Possible values are: 0: 1/4 LRA PERIOD and 1: 3/8 LRA PERIOD

 - qcom,lra-calibrate-at-eop : To calibrate at End of Pattern for PM660.

			Possible values are: 0 to disable and 1 to enable Calibration

			at End of Pattern

 - qcom,lra-res-cal-period : Auto resonance calibration period. The values range from

			4 to 32(default)

 - qcom,perform-lra-auto-resonance-search : boolean, define this property if:
@@ -109,6 +116,7 @@ Example: 
			interrupts = <0x3 0xc0 0x0>,

				     <0x3 0xc0 0x1>;

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

			qcom,pmic-revid = <&pm660_revid>;

			vcc_pon-supply = <&pon_perph_reg>;

			qcom,play-mode = "direct";

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

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

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -513,6 +513,7 @@ 
			interrupts = <0x3 0xc0 0x0>,

				<0x3 0xc0 0x1>;

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

			qcom,pmic-revid = <&pmi8937_revid>;

			vcc_pon-supply = <&pon_perph_reg>;

			qcom,play-mode = "direct";

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

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

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -584,6 +584,7 @@ 
			interrupts = <0x3 0xc0 0x0>,

				<0x3 0xc0 0x1>;

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

			qcom,pmic-revid = <&pmi8940_revid>;

			vcc_pon-supply = <&pon_perph_reg>;

			qcom,play-mode = "direct";

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

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

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -619,6 +619,7 @@ 
			interrupts = <0x3 0xc0 0x0>,

					<0x3 0xc0 0x1>;

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

			qcom,pmic-revid = <&pmi8950_revid>;

			vcc_pon-supply = <&pon_perph_reg>;

			qcom,play-mode = "direct";

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

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

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -555,6 +555,7 @@ 
			interrupts = <0x3 0xc0 0x0>,

				     <0x3 0xc0 0x1>;

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

			qcom,pmic-revid = <&pmi8994_revid>;

			vcc_pon-supply = <&pon_perph_reg>;

			qcom,play-mode = "direct";

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