Merge tag 'LA.UM.9.2.r1-03400-SDMxx0.0' into lineage-17.1 (247aec7b) · Commits · e / devices / android_kernel_sony_msm8998

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

+8 −12

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-2017, 2020, 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
		@@ -629,29 +629,25 @@
		#address-cells = <2>;
		#size-cells = <0>;

		pm660_haptics: qcom,haptic@c000 {
		compatible = "qcom,qpnp-haptic";
		pm660_haptics: qcom,haptics@c000 {
		compatible = "qcom,qpnp-haptics";
		reg = <0xc000 0x100>;
		interrupts = <0x1 0xc0 0x0 IRQ_TYPE_EDGE_BOTH>,
		<0x1 0xc0 0x1 IRQ_TYPE_EDGE_BOTH>;
		interrupt-names = "sc-irq", "play-irq";
		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 = "lra";
		qcom,actuator-type = <0>;
		qcom,play-mode = "direct";
		qcom,vmax-mv = <3200>;
		qcom,ilim-ma = <800>;
		qcom,wave-shape = "square";
		qcom,sc-dbc-cycles = <8>;
		qcom,wave-play-rate-us = <6667>;
		qcom,int-pwm-freq-khz = <505>;
		qcom,sc-deb-cycles = <8>;
		qcom,en-brake;
		qcom,brake-pattern = [03 03 00 00];
		qcom,lra-high-z = "opt0";
		qcom,lra-auto-res-mode = "qwd";
		qcom,lra-calibrate-at-eop = <0>;
		qcom,correct-lra-drive-freq;
		qcom,lra-res-cal-period = <4>;
		};
		};
		};

+9 −10

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-2017, 2020, 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
		@@ -638,26 +638,25 @@
		status = "okay";
		};

		pmi8998_haptics: qcom,haptic@c000 {
		status = "disabled";
		compatible = "qcom,qpnp-haptic";
		pmi8998_haptics: qcom,haptics@c000 {
		compatible = "qcom,qpnp-haptics";
		reg = <0xc000 0x100>;
		interrupts = <0x3 0xc0 0x0 IRQ_TYPE_EDGE_BOTH>,
		<0x3 0xc0 0x1 IRQ_TYPE_EDGE_BOTH>;
		interrupt-names = "sc-irq", "play-irq";
		interrupt-names = "hap-sc-irq", "hap-play-irq";
		qcom,pmic-revid = <&pmi8998_revid>;
		qcom,pmic-misc = <&pmi8998_misc>;
		qcom,misc-clk-trim-error-reg = <0xf3>;
		qcom,actuator-type = "lra";
		qcom,int-pwm-freq-khz = <505>;
		qcom,play-mode = "direct";
		qcom,wave-play-rate-us = <6667>;
		qcom,actuator-type = <0>;
		qcom,wave-shape = "square";
		qcom,vmax-mv = <3200>;
		qcom,ilim-ma = <800>;
		qcom,wave-shape = "square";
		qcom,wave-play-rate-us = <6667>;
		qcom,int-pwm-freq-khz = <505>;
		qcom,sc-deb-cycles = <8>;
		qcom,en-brake;
		qcom,brake-pattern = [03 03 00 00];
		qcom,brake-pattern = <0x3 0x3 0x0 0x0>;
		qcom,lra-high-z = "opt1";
		qcom,lra-auto-res-mode = "qwd";
		qcom,lra-res-cal-period = <4>;

+1 −0

+1 −0

Original line number	Diff line number	Diff line
		@@ -509,6 +509,7 @@ CONFIG_LEDS_QPNP=y
		CONFIG_LEDS_QPNP_FLASH_V2=y
		CONFIG_LEDS_QPNP_WLED=y
		CONFIG_LEDS_SYSCON=y
		CONFIG_LEDS_QPNP_HAPTICS=y
		CONFIG_LEDS_TRIGGERS=y
		CONFIG_LEDS_TRIGGER_HEARTBEAT=y
		CONFIG_LEDS_TRIGGER_CPU=y

+1 −0