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

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

Merge "ARM: dts: msm: add HBoost register address base for PM8350B"

parents a2b3621c 1e23d0a0

bindings/input/qcom-hv-haptics.txt

+3 −2
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ Properties: 
- reg:

  Usage:	required

  Value type:	<prop-encoded-array>

  Definition:	Register base for HAPTICS_CFG and HAPTICS_PATTERN modules.

  Definition:	Register base for following haptics modules: HAPTICS_CFG,

		HAPTICS_PATTERN, HAPTICS_BOOST.



- interrupts:

  Usage:	required
@@ -242,7 +243,7 @@ different vibration effects: 
Example:

	qcom,hv-haptics@f000 {

		compatible = "qcom,hv-haptics";

		reg = <0xf000>, <0xf100>;

		reg = <0xf000>, <0xf100>, <0xf200>;

		interrupts = <0x3 0xf0 0x1 IRQ_TYPE_EDGE_BOTH>;

		interrupt-names = "fifo-empty";

		nvmem-cell-names = "hap_cl_brake";

qcom/pm8350b.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 


		pm8350b_haptics: qcom,hv-haptics@f000 {

			compatible = "qcom,hv-haptics";

			reg = <0xf000>, <0xf100>;

			reg = <0xf000>, <0xf100>, <0xf200>;

			interrupts = <0x3 0xf0 0x1 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "fifo-empty";

			qcom,vmax-mv = <3600>;