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

Merge "soc: qcom: qpnp-haptic: Remove use-play-irq and use-sc-irq flags"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-21 13:28:47 -07:00 • committed by Gerrit - the friendly Code Review server
commit 600a9f7e48
5 changed files with 483 additions and 559 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Documentation/devicetree/bindings/soc/qcom/qpnp-haptic.txt
View file

@ -24,8 +24,6 @@ Optional Properties:
2-bit amplitude control 0x00: 0, 0x01: vmax/4, 0x02: vmax/2,
0x03: vmax. Default values are 0x00.
- qcom,sc-deb-cycles : short circuit debounce in internal pwm switching clock cycles
- qcom,use-play-irq : boolean, use this if the device uses irq for play
- qcom,use-sc-irq : boolean, use this if the device uses irq for play
- interrupts: Specifies the interrupt associated with Haptics. The available
interrupts are play and short circuit. The values for play and
short circuit are <0x3 0xc0 0x0> and <0x3 0xc0 0x1>.
@ -54,9 +52,11 @@ Optional properties for pwm play mode:
Optional properties when qcom,actuator-type is "lra"
- qcom,correct-lra-drive-freq : boolean, use this to ensure LRA is driven at correct resonant
frequency, which may change due to operating conditions.
- qcom,misc-trim-error-rc19p2-clk-reg-present : boolean, use this if TRIM_ERROR_RC19P2_CLK
register is present in MISC module. This register holds
the frequency error in 19.2Mhz RC clock.
- qcom,pmic-misc : phandle of misc device using which the clock
trim error can be read from.
- qcom,misc-clk-trim-error-reg : Address offset of MISC_TRIM_ERROR_RC19P2_CLK
register if present in MISC module. This
holds the frequency error in 19.2 MHz clock.
- qcom,lra-auto-res-mode : auto resonance technique, four different modes
"none" : no auto resonance
"zxd" : zero crossing based discontinuous method
@ -118,6 +118,8 @@ Example:
interrupt-names = "sc-irq", "play-irq";
qcom,pmic-revid = <&pm660_revid>;
vcc_pon-supply = <&pon_perph_reg>;
qcom,pmic-misc = <&pmi8998_misc>;
qcom,misc-clk-trim-error-reg = <0xf3>;
qcom,play-mode = "direct";
qcom,wave-play-rate-us = <5263>;
qcom,actuator-type = "lra";
@ -128,8 +130,6 @@ Example:
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>;

14
arch/arm/boot/dts/qcom/msm-pm660.dtsi
View file

@ -26,6 +26,11 @@
qcom,fab-id-valid;
};
pm660_misc: qcom,misc@900 {
compatible = "qcom,qpnp-misc";
reg = <0x900 0x100>;
};
qcom,power-on@800 {
compatible = "qcom,qpnp-power-on";
reg = <0x800 0x100>;
@ -605,10 +610,12 @@
pm660_haptics: qcom,haptic@c000 {
compatible = "qcom,qpnp-haptic";
reg = <0xc000 0x100>;
interrupts = <0x1 0xc0 0x0 IRQ_TYPE_NONE>,
<0x1 0xc0 0x1 IRQ_TYPE_NONE>;
interrupts = <0x1 0xc0 0x0 IRQ_TYPE_EDGE_BOTH>,
<0x1 0xc0 0x1 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "sc-irq", "play-irq";
qcom,pmic-revid = <&pm660_revid>;
qcom,pmic-misc = <&pm660_misc>;
qcom,misc-clk-trim-error-reg = <0xf3>;
qcom,actuator-type = "lra";
qcom,play-mode = "direct";
qcom,vmax-mv = <3200>;
@ -619,13 +626,10 @@
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 = "opt0";
qcom,lra-auto-res-mode = "qwd";
qcom,lra-calibrate-at-eop = <0>;
qcom,correct-lra-drive-freq;
qcom,misc-trim-error-rc19p2-clk-reg-present;
};
};
};

8
arch/arm/boot/dts/qcom/msm-pmi8994.dtsi
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-2017, 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
@ -544,8 +544,8 @@
status = "disabled";
compatible = "qcom,qpnp-haptic";
reg = <0xc000 0x100>;
interrupts = <0x3 0xc0 0x0 IRQ_TYPE_NONE>,
<0x3 0xc0 0x1 IRQ_TYPE_NONE>;
interrupts = <0x3 0xc0 0x0 IRQ_TYPE_EDGE_BOTH>,
<0x3 0xc0 0x1 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "sc-irq", "play-irq";
vcc_pon-supply = <&pon_perph_reg>;
qcom,play-mode = "direct";
@ -558,8 +558,6 @@
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>;

14
arch/arm/boot/dts/qcom/msm-pmi8998.dtsi
View file

@ -31,6 +31,11 @@
reg = <0x800 0x100>;
};
pmi8998_misc: qcom,misc@900 {
compatible = "qcom,qpnp-misc";
reg = <0x900 0x100>;
};
qcom,temp-alarm@2400 {
compatible = "qcom,qpnp-temp-alarm";
reg = <0x2400 0x100>;
@ -628,10 +633,12 @@
status = "disabled";
compatible = "qcom,qpnp-haptic";
reg = <0xc000 0x100>;
interrupts = <0x3 0xc0 0x0 IRQ_TYPE_NONE>,
<0x3 0xc0 0x1 IRQ_TYPE_NONE>;
interrupts = <0x3 0xc0 0x0 IRQ_TYPE_EDGE_BOTH>,
<0x3 0xc0 0x1 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "sc-irq", "play-irq";
qcom,pmic-revid = <&pmi8998_revid>;
qcom,pmic-misc = <&pmi8998_misc>;
qcom,misc-clk-trim-error-reg = <0xf3>;
qcom,actuator-type = "lra";
qcom,play-mode = "direct";
qcom,vmax-mv = <3200>;
@ -642,13 +649,10 @@
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>;
qcom,correct-lra-drive-freq;
qcom,misc-trim-error-rc19p2-clk-reg-present;
};
flash_led: qcom,leds@d300 {

992
drivers/soc/qcom/qpnp-haptic.c
View file

File diff suppressed because it is too large Load diff