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

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

Merge "ARM: dts: msm8909w: Change to use input FF haptics device config"

parents ccb66967 c76f0ef6

arch/arm/configs/msm8909w-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v26=y 
CONFIG_TOUCHSCREEN_FTS=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_QTI_HAPTICS=y

CONFIG_INPUT_UINPUT=y

# CONFIG_DEVMEM is not set

# CONFIG_DEVKMEM is not set
@@ -374,7 +375,6 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_SDHCI_MSM=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

arch/arm/configs/msm8909w_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v26=y 
CONFIG_TOUCHSCREEN_FTS=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_QTI_HAPTICS=y

CONFIG_INPUT_UINPUT=y

# CONFIG_DEVMEM is not set

# CONFIG_DEVKMEM is not set
@@ -368,7 +369,6 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_SDHCI_MSM=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

arch/arm64/boot/dts/qcom/8909w-pm660.dtsi

+44 −13
Original line number Diff line number Diff line
@@ -437,24 +437,55 @@ 


&pm660_1 {

	pm660_haptics: qcom,haptics@c000 {

		compatible = "qcom,qpnp-haptics";

		compatible = "qcom,pm660-haptics";

		reg = <0xc000 0x100>;

		interrupts = <0x1 0xc0 0x0 IRQ_TYPE_EDGE_BOTH>,

			     <0x1 0xc0 0x1 IRQ_TYPE_EDGE_BOTH>;

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

		qcom,pmic-revid = <&pm660_revid>;

		qcom,pmic-misc = <&pm660_misc>;

		qcom,misc-clk-trim-error-reg = <0xf3>;

		qcom,actuator-type = <1>;

		qcom,play-mode = "direct";

		qcom,actuator-type = "erm";

		qcom,vmax-mv = <3200>;

		qcom,ilim-ma = <800>;

		qcom,sc-dbc-cycles = <8>;

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

		qcom,en-brake;

		qcom,lra-high-z = "opt0";

		qcom,lra-auto-res-mode = "qwd";

		qcom,lra-res-cal-period = <4>;

		qcom,ilim-ma = <400>;

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

		wf_0 {

			/* CLICK */

			qcom,effect-id = <0>;

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

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

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

		};

		wf_1 {

			/* DOUBLE CLICK */

			qcom,effect-id = <1>;

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

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

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

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

		};

		wf_2 {

			/* TICK */

			qcom,effect-id = <2>;

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

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

		};

		wf_3 {

			/* THUD */

			qcom,effect-id = <3>;

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

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

		};

		wf_4 {

			/* POP */

			qcom,effect-id = <4>;

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

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

		};

		wf_5 {

			/* HEAVY CLICK */

			qcom,effect-id = <5>;

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

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

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

		};

	};

};