evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: Enable PWM, Haptics and Flash for PM2FALCON"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-06 14:33:24 -08:00 • committed by Gerrit - the friendly Code Review server
commit eeb2184f0d
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi
View file

@ -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";

23
arch/arm/boot/dts/qcom/msm-pmfalcon.dtsi
View file

@ -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>;
};
};
};