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

Commit 69c87bdd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add PBS device for PM8350B haptics ISC config"

parents 670b377f 0ac2ac10

bindings/input/qcom-hv-haptics.txt

+8 −0
Original line number Diff line number Diff line
@@ -112,6 +112,13 @@ Properties: 
  Definition:	Phandle of the nvmem device used for haptics configuration.

		Please refer to nvmem bindings as described in bindings/nvmem/nvmem.txt.



- qcom,pbs-client:

  Usage:	optional

  Value type:	<phandle>

  Definition:	Phandle of the PBS client used for triggering PBS to configure

		haptics ISC (short circuit current) config during LRA impedance

		detection.



The following properties are only required when LRA actuator is used:



- qcom,lra-period-us:
@@ -262,6 +269,7 @@ Example: 
		nvmem-cells = <&hap_cl_brake>;

		nvmem-names = "hap_cfg_sdam";

		nvmem = <&pmk8350_sdam_46>;

		qcom,pbs-client = <&pm8350b_pbs2>;

		qcom,vmax-mv = <900>;

		qcom,brake-mode = <BRAKE_CLOSE_LOOP>;

		qcom,brake-pattern = /bits/ 8 <0xff 0x3f 0x1f>;

qcom/lahaina-pmic-overlay.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ 
	nvmem-cells = <&hap_cl_brake>;

	nvmem-names = "hap_cfg_sdam";

	nvmem = <&pmk8350_sdam_46>;

	qcom,pbs-client = <&pm8350b_pbs2>;

};



&pmr735a_tz {

qcom/pm8350b.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ 
			#thermal-sensor-cells = <0>;

		};



		pm8350b_pbs2: qcom,pbs@1900 {

			compatible = "qcom,qpnp-pbs";

			reg = <0x1900>;

		};



		pm8350b_gpios: pinctrl@8800 {

			compatible = "qcom,pm8350b-gpio";

			reg = <0x8800>;