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

Commit eeb2184f 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: Enable PWM, Haptics and Flash for PM2FALCON"

parents ecef458e 21e26cc2

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

+4 −5
Original line number Diff line number Diff line
@@ -130,10 +130,10 @@ 
			reg-names = "qpnp-lpg-channel-base",

					"qpnp-lpg-lut-base";

			qcom,channel-id = <1>;

			qcom,lpg-lut-size = <0x7e>;

			qcom,supported-sizes = <6>, <9>;

			qcom,ramp-index = <0>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		pm2falcon_pwm_2: pwm@b200 {
@@ -143,10 +143,10 @@ 
			reg-names = "qpnp-lpg-channel-base",

					 "qpnp-lpg-lut-base";

			qcom,channel-id = <2>;

			qcom,lpg-lut-size = <0x7e>;

			qcom,supported-sizes = <6>, <9>;

			qcom,ramp-index = <1>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		pm2falcon_pwm_3: pwm@b300 {
@@ -156,10 +156,10 @@ 
			reg-names = "qpnp-lpg-channel-base",

					 "qpnp-lpg-lut-base";

			qcom,channel-id = <3>;

			qcom,lpg-lut-size = <0x7e>;

			qcom,supported-sizes = <6>, <9>;

			qcom,ramp-index = <2>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		pm2falcon_pwm_4: pwm@b400 {
@@ -169,6 +169,7 @@ 
			reg-names = "qpnp-lpg-channel-base",

					 "qpnp-lpg-lut-base";

			qcom,channel-id = <4>;

			qcom,lpg-lut-size = <0x7e>;

			qcom,supported-sizes = <6>, <9>;

			qcom,ramp-index = <3>;

			#pwm-cells = <2>;
@@ -179,7 +180,6 @@ 
			compatible = "qcom,leds-qpnp";

			reg = <0xd000 0x100>;

			label = "rgb";

			status = "disabled";



			red_led: qcom,rgb_0 {

				label = "rgb";
@@ -270,7 +270,6 @@ 
			qcom,thermal-derate-current = <200 500 1000>;

			qcom,isc-delay = <192>;

			qcom,pmic-revid = <&pm2falcon_revid>;

			status = "disabled";



			pm2falcon_flash0: qcom,flash_0 {

				label = "flash";

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

+23 −0
Original line number Diff line number Diff line
@@ -557,5 +557,28 @@ 
		reg = <0x1 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pmfalcon_haptics: qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x1 0xc0 0x0>,

				     <0x1 0xc0 0x1>;

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

			qcom,actuator-type = "lra";

			qcom,play-mode = "direct";

			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,use-play-irq;

			qcom,use-sc-irq;

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

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

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

		};

	};

};