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

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

Merge "ARM: dts: msm: add haptics boost configuration for kona platforms"

parents 0432daec 12dfaa9b

arch/arm64/boot/dts/qcom/kona-mtp.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -150,6 +150,14 @@ 
	};

};



&vreg_hap_boost {

	status = "ok";

};



&pm8150b_haptics {

	vdd-supply = <&vreg_hap_boost>;

};



&pm8150b_vadc {

	#address-cells = <1>;

	#size-cells = <0>;

arch/arm64/boot/dts/qcom/kona-pmic-overlay.dtsi

+25 −0
Original line number Diff line number Diff line
@@ -102,6 +102,20 @@ 
	vconn-supply = <&smb5_vconn>;

};



&pm8150b_gpios {

	haptics_boost {

		haptics_boost_default: haptics_boost_default {

			pins = "gpio5";

			function = "normal";

			output-enable;

			input-disable;

			bias-disable;

			qcom,drive-strength = <3>; /* high */

			power-source = <1>; /* 1.8 V */

		};

	};

};



&soc {

	vreg_tof: regulator-dbb1 {

		compatible = "regulator-fixed";
@@ -112,6 +126,17 @@ 
		startup-delay-us = <1000>;

		enable-active-high;

	};



	vreg_hap_boost: regulator-haptics-boost {

		compatible = "regulator-fixed";

		regulator-name = "vdd_hap_boost";

		gpio = <&pm8150b_gpios 5 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&haptics_boost_default>;

		startup-delay-us = <1000>;

		enable-active-high;

		status = "disabled";

	};

};



&usb0 {

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

+46 −0
Original line number Diff line number Diff line
@@ -173,6 +173,52 @@ 
	};

};



&vreg_hap_boost {

	status = "ok";

};



&pm8150b_haptics {

	qcom,vmax-mv = <1697>;

	qcom,play-rate-us = <5882>;

	vdd-supply = <&vreg_hap_boost>;



	wf_0 {

		/* CLICK */

		qcom,wf-play-rate-us = <5882>;

		qcom,wf-vmax-mv = <1697>;

	};



	wf_1 {

		/* DOUBLE CLICK */

		qcom,wf-play-rate-us = <5882>;

		qcom,wf-vmax-mv = <1697>;

	};



	wf_2 {

		/* TICK */

		qcom,wf-play-rate-us = <5882>;

		qcom,wf-vmax-mv = <1697>;

	};



	wf_3 {

		/* THUD */

		qcom,wf-play-rate-us = <5882>;

		qcom,wf-vmax-mv = <1697>;

	};



	wf_4 {

		/* POP */

		qcom,wf-play-rate-us = <5882>;

		qcom,wf-vmax-mv = <1697>;

	};



	wf_5 {

		/* HEAVY CLICK */

		qcom,wf-play-rate-us = <5882>;

		qcom,wf-vmax-mv = <1697>;

	};

};



&pm8150b_vadc {

	#address-cells = <1>;

	#size-cells = <0>;

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

+27 −13
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ 
				     <0x3 0xc0 0x1 IRQ_TYPE_EDGE_BOTH>;

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

			qcom,actuator-type = "lra";

			qcom,vmax-mv = <3400>;

			qcom,vmax-mv = <3600>;

			qcom,play-rate-us = <6667>;

			qcom,lra-resonance-sig-shape = "sine";

			qcom,lra-auto-resonance-mode = "qwd";
@@ -449,9 +449,11 @@ 
				/* CLICK */

				qcom,effect-id = <0>;

				qcom,wf-vmax-mv = <3600>;

				qcom,wf-pattern = [3e 3e 3e];

				qcom,wf-pattern = [3e 3e 3e 3e 3e 3e 3e 3e];

				qcom,wf-play-rate-us = <6667>;

				qcom,wf-brake-pattern = [01 00 00 00];

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

				qcom,wf-repeat-count = <1>;

				qcom,wf-s-repeat-count = <1>;

				qcom,lra-auto-resonance-disable;

			};
@@ -459,9 +461,10 @@ 
				/* DOUBLE CLICK */

				qcom,effect-id = <1>;

				qcom,wf-vmax-mv = <3600>;

				qcom,wf-pattern = [7e 7e 02 02 02 02 02 02];

				qcom,wf-play-rate-us = <7143>;

				qcom,wf-repeat-count = <2>;

				qcom,wf-pattern = [3e 3e 3e 3e 3e 3e 3e 3e];

				qcom,wf-play-rate-us = <6667>;

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

				qcom,wf-repeat-count = <1>;

				qcom,wf-s-repeat-count = <1>;

				qcom,lra-auto-resonance-disable;

			};
@@ -470,8 +473,11 @@ 
				/* TICK */

				qcom,effect-id = <2>;

				qcom,wf-vmax-mv = <3600>;

				qcom,wf-pattern = [7e 7e];

				qcom,wf-play-rate-us = <4000>;

				qcom,wf-pattern = [3e 3e 3e 3e 3e 3e 3e 3e];

				qcom,wf-play-rate-us = <6667>;

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

				qcom,wf-repeat-count = <1>;

				qcom,wf-s-repeat-count = <1>;

				qcom,lra-auto-resonance-disable;

			};
@@ -479,8 +485,11 @@ 
				/* THUD */

				qcom,effect-id = <3>;

				qcom,wf-vmax-mv = <3600>;

				qcom,wf-pattern = [7e 7e 7e];

				qcom,wf-pattern = [3e 3e 3e 3e 3e 3e 3e 3e];

				qcom,wf-play-rate-us = <6667>;

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

				qcom,wf-repeat-count = <1>;

				qcom,wf-s-repeat-count = <1>;

				qcom,lra-auto-resonance-disable;

			};
@@ -488,8 +497,11 @@ 
				/* POP */

				qcom,effect-id = <4>;

				qcom,wf-vmax-mv = <3600>;

				qcom,wf-pattern = [7e 7e];

				qcom,wf-play-rate-us = <5000>;

				qcom,wf-pattern = [3e 3e 3e 3e 3e 3e 3e 3e];

				qcom,wf-play-rate-us = <6667>;

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

				qcom,wf-repeat-count = <1>;

				qcom,wf-s-repeat-count = <1>;

				qcom,lra-auto-resonance-disable;

			};
@@ -497,9 +509,11 @@ 
				/* HEAVY CLICK */

				qcom,effect-id = <5>;

				qcom,wf-vmax-mv = <3600>;

				qcom,wf-pattern = [7e 7e 7e];

				qcom,wf-pattern = [3e 3e 3e 3e 3e 3e 3e 3e];

				qcom,wf-play-rate-us = <6667>;

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

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

				qcom,wf-repeat-count = <1>;

				qcom,wf-s-repeat-count = <1>;

				qcom,lra-auto-resonance-disable;

			};

		};