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

Commit 006f7330 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: msm: reorganize Haptics DT for 8952"

parents aa4e936c 9c08b566

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

+23 −0
Original line number Diff line number Diff line
@@ -580,5 +580,28 @@ 
				qcom,current = <120>;

			};

		};



		pmi8950_haptic: qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x3 0xc0 0x0>,

					<0x3 0xc0 0x1>;

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

			qcom,play-mode = "direct";

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

			qcom,actuator-type = "erm";

			qcom,wave-shape = "square";

			qcom,vmax-mv = <2000>;

			qcom,ilim-ma = <800>;

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

			qcom,int-pwm-freq-khz = <505>;

			qcom,en-brake;

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

			qcom,use-play-irq;

			qcom,use-sc-irq;

			qcom,wave-samples = [3e 3e 3e 3e 3e 3e 3e 3e];

			qcom,wave-rep-cnt = <1>;

			qcom,wave-samp-rep-cnt = <1>;

		};

	};

};

arch/arm/boot/dts/qcom/msm8952-cdp.dtsi

+0 −23
Original line number Diff line number Diff line
@@ -334,29 +334,6 @@ 
			pinctrl-0 = <&flash_led_enable>;

			pinctrl-1 = <&flash_led_disable>;

		};



		qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x3 0xc0 0x0>,

					<0x3 0xc0 0x1>;

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

			qcom,play-mode = "direct";

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

			qcom,actuator-type = "erm";

			qcom,wave-shape = "square";

			qcom,vmax-mv = <2000>;

			qcom,ilim-ma = <800>;

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

			qcom,int-pwm-freq-khz = <505>;

			qcom,en-brake;

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

			qcom,use-play-irq;

			qcom,use-sc-irq;

			qcom,wave-samples = [3e 3e 3e 3e 3e 3e 3e 3e];

			qcom,wave-rep-cnt = <1>;

			qcom,wave-samp-rep-cnt = <1>;

		};

	};

};

arch/arm/boot/dts/qcom/msm8952-mtp.dtsi

+0 −23
Original line number Diff line number Diff line
@@ -316,29 +316,6 @@ 
			pinctrl-0 = <&flash_led_enable>;

			pinctrl-1 = <&flash_led_disable>;

		};



		qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x3 0xc0 0x0>,

					<0x3 0xc0 0x1>;

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

			qcom,play-mode = "direct";

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

			qcom,actuator-type = "erm";

			qcom,wave-shape = "square";

			qcom,vmax-mv = <2000>;

			qcom,ilim-ma = <800>;

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

			qcom,int-pwm-freq-khz = <505>;

			qcom,en-brake;

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

			qcom,use-play-irq;

			qcom,use-sc-irq;

			qcom,wave-samples = [3e 3e 3e 3e 3e 3e 3e 3e];

			qcom,wave-rep-cnt = <1>;

			qcom,wave-samp-rep-cnt = <1>;

		};

	};

};

arch/arm/boot/dts/qcom/msm8952-qrd-skum.dtsi

+0 −25
Original line number Diff line number Diff line
@@ -31,31 +31,6 @@ 
			};

		};

	};



	qcom,pmi8950@3 {

		qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x3 0xc0 0x0>,

					<0x3 0xc0 0x1>;

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

			qcom,play-mode = "direct";

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

			qcom,actuator-type = "erm";

			qcom,wave-shape = "square";

			qcom,vmax-mv = <3300>;

			qcom,ilim-ma = <800>;

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

			qcom,int-pwm-freq-khz = <505>;

			qcom,en-brake;

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

			qcom,use-play-irq;

			qcom,use-sc-irq;

			qcom,wave-samples = [3e 3e 3e 3e 3e 3e 3e 3e];

			qcom,wave-rep-cnt = <1>;

			qcom,wave-samp-rep-cnt = <1>;

		};

	};

};



&i2c_3 { /* BLSP1 QUP3 */