Skip to content

Commit

Permalink
[touchscreen] Fix touch issues
Browse files Browse the repository at this point in the history 
Patch from:
vasishath/kernel_cancro@0de9fd2#diff-f137ed097ce39bf6afd03ccb17e60350.patch

To fix touchscreen issues on Mi4.
  • Loading branch information
@saidinesh5
saidinesh5 committed Dec 21, 2016
1 parent a94bdb1 commit 1b4a683
Show file tree
Hide file tree
Showing 2 changed files with 136 additions and 133 deletions.
136 changes: 3 additions & 133 deletions arch/arm/boot/dts/msm8974-mtp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,137 +87,7 @@
status = "disabled";
};

i2c@f9924000 {
atmel_mxt_ts@4a {
compatible = "atmel,mxt-ts";
reg = <0x4a>;
interrupt-parent = <&msmgpio>;
interrupts = <54 0x2>;
atmel,reset-gpio = <&msmgpio 60 0x00>;
atmel,irq-gpio = <&msmgpio 54 0x2008>;
atmel,power-gpio = <&msmgpio 48 0x00>;
atmel,mxt-fw-name = "mxT540SC30.fw";
atmel,unlock-move-threshold = <90000>;
atmel,staying-threshold = <5>;
atmel,landing-threshold = <8>;
atmel,landing-edge-threshold = <28>;
atmel,landing-jiffies = <1000>;
atmel,edge-clip = <130>;
atmel,config-array-size = <4>;
atmel,irqflags = <0x2008>;
atmel,gpio-mask = <0x4>;
atmel,linearity-reg-pos = <11 12 17 18>;
atmel,linearity-singlex = <10 10 178 50>;
atmel,linearity-dualx = <24 244 63 51>;
atmel,linearity-para-num = <4>;
atmel,rx-num = <18>;
atmel,tx-num = <30>;
atmel,ref-diff-threshold = <400>;
atmel,ref-diff-halfline-threshold = <500>;
atmel,cfg_1 {
atmel,fw-name = "atmel_8974_fluid_v1_0_AA.hex";
atmel,family-id = <0x82>;
atmel,variant-id = <0x2C>;
atmel,version = <0x21>;
atmel,build = <0x00>;
atmel,mxt-cfg-name = "mxt_double_diamond_config.fw";
atmel,vendor-id = <0x00>;
atmel,rev-id = <0x00>;
atmel,lcd-id = <0x00>;
atmel,key-codes = <139 102 158>;
atmel,key-num = <3>;
atmel,selfthr-suspend = <0>;
atmel,selfintthr-stylus = <0>;
atmel,selfintthr-suspend = <0>;
atmel,t71-tchthr-pos = <22>;
atmel,self-no-touch-threshold = <0>;
atmel,mult-no-touch-threshold = <0>;
atmel,self-chgtime-min = <0>;
atmel,self-chgtime-max = <0>;
atmel,mult-intthr-sensitive = <12>;
atmel,mult-intthr-not-sensitive = <20>;
atmel,atchthr-sensitive = <6>;
atmel,mult-tchthr-sensitive = <0>;
atmel,mult-tchthr-not-sensitive = <0>;
};
atmel,cfg_2 {
atmel,family-id = <0x82>;
atmel,variant-id = <0x2C>;
atmel,version = <0x21>;
atmel,build = <0x00>;
atmel,mxt-cfg-name = "mxt_wintek_diamond_config_v20.fw";
atmel,vendor-id = <0x04>;
atmel,rev-id = <0x00>;
atmel,lcd-id = <0x00>;
atmel,key-codes = <158 102 139>;
atmel,key-num = <3>;
atmel,selfthr-suspend = <0>;
atmel,selfintthr-stylus = <0>;
atmel,selfintthr-suspend = <0>;
atmel,t71-tchthr-pos = <22>;
atmel,self-no-touch-threshold = <0>;
atmel,mult-no-touch-threshold = <0>;
atmel,self-chgtime-min = <0>;
atmel,self-chgtime-max = <0>;
atmel,mult-intthr-sensitive = <12>;
atmel,mult-intthr-not-sensitive = <20>;
atmel,atchthr-sensitive = <6>;
atmel,mult-tchthr-sensitive = <0>;
atmel,mult-tchthr-not-sensitive = <0>;
};
atmel,cfg_3 {
atmel,family-id = <0x82>;
atmel,variant-id = <0x2C>;
atmel,version = <0x30>;
atmel,build = <0xAA>;
atmel,mxt-cfg-name = "mxt_wintek_diamond_config_v30_sharp.fw";
atmel,vendor-id = <0x04>;
atmel,rev-id = <0x00>;
atmel,lcd-id = <0x00>;
atmel,key-codes = <158 102 139>;
atmel,key-num = <3>;
atmel,selfthr-suspend = <51>;
atmel,selfintthr-stylus = <12>;
atmel,selfintthr-suspend = <8>;
atmel,t71-tchthr-pos = <22>;
atmel,self-no-touch-threshold = <220>;
atmel,mult-no-touch-threshold = <70>;
atmel,self-chgtime-min = <70>;
atmel,self-chgtime-max = <100>;
atmel,mult-intthr-sensitive = <12>;
atmel,mult-intthr-not-sensitive = <20>;
atmel,atchthr-sensitive = <6>;
atmel,mult-tchthr-sensitive = <0x3C>;
atmel,mult-tchthr-not-sensitive = <0x20>;
};
atmel,cfg_4 {
atmel,family-id = <0x82>;
atmel,variant-id = <0x2C>;
atmel,version = <0x30>;
atmel,build = <0xAA>;
atmel,mxt-cfg-name = "mxt_wintek_diamond_config_v30_lg.fw";
atmel,vendor-id = <0x04>;
atmel,rev-id = <0x00>;
atmel,lcd-id = <0x01>;
atmel,key-codes = <158 102 139>;
atmel,key-num = <3>;
atmel,selfthr-suspend = <51>;
atmel,selfintthr-stylus = <12>;
atmel,selfintthr-suspend = <8>;
atmel,t71-tchthr-pos = <22>;
atmel,self-no-touch-threshold = <220>;
atmel,mult-no-touch-threshold = <70>;
atmel,self-chgtime-min = <70>;
atmel,self-chgtime-max = <100>;
atmel,mult-intthr-sensitive = <12>;
atmel,mult-intthr-not-sensitive = <20>;
atmel,atchthr-sensitive = <6>;
atmel,mult-tchthr-sensitive = <0x3C>;
atmel,mult-tchthr-not-sensitive = <0x20>;
};
};
};


gen-vkeys {
compatible = "qcom,gen-vkeys";
label = "atmel_mxt_ts";
Expand Down Expand Up @@ -469,7 +339,7 @@
mtp_batterydata: qcom,battery-data {
qcom,rpull-up-kohm = <100>;
qcom,vref-batt-therm = <1800000>;

/include/ "batterydata-BM31-SDI-2980mAh.dtsi"
/include/ "batterydata-BM31-SONY-2980mAh.dtsi"
/include/ "batterydata-BM31-LG-2980mAh.dtsi"
Expand All @@ -480,7 +350,7 @@
/include/ "batterydata-BM31-SDI-3080mAh.dtsi"
/include/ "batterydata-BM31-LG-3080mAh.dtsi"
/include/ "batterydata-BM31-LG-3080mAh-44V.dtsi"
/include/ "batterydata-BM31-SONY-3080mAh-44V.dtsi"
/include/ "batterydata-BM31-SONY-3080mAh-44V.dtsi"
};
};

Expand Down
133 changes: 133 additions & 0 deletions arch/arm/boot/dts/msm8974pro-ab-pm8941-mtp.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,146 @@
qcom,board-id = <8 0>;
};


&sdhc_1 {
qcom,pad-pull-on = <0x0 0x3 0x3 0x1>; /* no-pull, pull-up, pull-up, pull-down */
qcom,pad-pull-off = <0x0 0x3 0x3 0x1>; /* no-pull, pull-up, pull-up, pull-down */
qcom,pad-drv-on = <0x4 0x4 0x4>; /* 10mA, 10mA, 10mA */
};

&soc {

i2c@f9924000 {
atmel_mxt_ts@4a {
compatible = "atmel,mxt-ts";
reg = <0x4a>;
interrupt-parent = <&msmgpio>;
interrupts = <54 0x2>;
atmel,reset-gpio = <&msmgpio 60 0x00>;
atmel,irq-gpio = <&msmgpio 54 0x2008>;
atmel,power-gpio = <&msmgpio 48 0x00>;
atmel,mxt-fw-name = "mxT540SC30.fw";
atmel,unlock-move-threshold = <90000>;
atmel,staying-threshold = <5>;
atmel,landing-threshold = <8>;
atmel,landing-edge-threshold = <28>;
atmel,landing-jiffies = <1000>;
atmel,edge-clip = <130>;
atmel,config-array-size = <4>;
atmel,irqflags = <0x2008>;
atmel,gpio-mask = <0x4>;
atmel,linearity-reg-pos = <11 12 17 18>;
atmel,linearity-singlex = <10 10 178 50>;
atmel,linearity-dualx = <24 244 63 51>;
atmel,linearity-para-num = <4>;
atmel,rx-num = <18>;
atmel,tx-num = <30>;
atmel,ref-diff-threshold = <400>;
atmel,ref-diff-halfline-threshold = <500>;
atmel,cfg_1 {
atmel,fw-name = "atmel_8974_fluid_v1_0_AA.hex";
atmel,family-id = <0x82>;
atmel,variant-id = <0x2C>;
atmel,version = <0x21>;
atmel,build = <0x00>;
atmel,mxt-cfg-name = "mxt_double_diamond_config.fw";
atmel,vendor-id = <0x00>;
atmel,rev-id = <0x00>;
atmel,lcd-id = <0x00>;
atmel,key-codes = <139 102 158>;
atmel,key-num = <3>;
atmel,selfthr-suspend = <0>;
atmel,selfintthr-stylus = <0>;
atmel,selfintthr-suspend = <0>;
atmel,t71-tchthr-pos = <22>;
atmel,self-no-touch-threshold = <0>;
atmel,mult-no-touch-threshold = <0>;
atmel,self-chgtime-min = <0>;
atmel,self-chgtime-max = <0>;
atmel,mult-intthr-sensitive = <12>;
atmel,mult-intthr-not-sensitive = <20>;
atmel,atchthr-sensitive = <6>;
atmel,mult-tchthr-sensitive = <0>;
atmel,mult-tchthr-not-sensitive = <0>;
};
atmel,cfg_2 {
atmel,family-id = <0x82>;
atmel,variant-id = <0x2C>;
atmel,version = <0x21>;
atmel,build = <0x00>;
atmel,mxt-cfg-name = "mxt_wintek_diamond_config_v20.fw";
atmel,vendor-id = <0x04>;
atmel,rev-id = <0x00>;
atmel,lcd-id = <0x00>;
atmel,key-codes = <158 102 139>;
atmel,key-num = <3>;
atmel,selfthr-suspend = <0>;
atmel,selfintthr-stylus = <0>;
atmel,selfintthr-suspend = <0>;
atmel,t71-tchthr-pos = <22>;
atmel,self-no-touch-threshold = <0>;
atmel,mult-no-touch-threshold = <0>;
atmel,self-chgtime-min = <0>;
atmel,self-chgtime-max = <0>;
atmel,mult-intthr-sensitive = <12>;
atmel,mult-intthr-not-sensitive = <20>;
atmel,atchthr-sensitive = <6>;
atmel,mult-tchthr-sensitive = <0>;
atmel,mult-tchthr-not-sensitive = <0>;
};
atmel,cfg_3 {
atmel,family-id = <0x82>;
atmel,variant-id = <0x2C>;
atmel,version = <0x30>;
atmel,build = <0xAA>;
atmel,mxt-cfg-name = "mxt_wintek_diamond_config_v30_sharp.fw";
atmel,vendor-id = <0x04>;
atmel,rev-id = <0x00>;
atmel,lcd-id = <0x00>;
atmel,key-codes = <158 102 139>;
atmel,key-num = <3>;
atmel,selfthr-suspend = <51>;
atmel,selfintthr-stylus = <12>;
atmel,selfintthr-suspend = <8>;
atmel,t71-tchthr-pos = <22>;
atmel,self-no-touch-threshold = <220>;
atmel,mult-no-touch-threshold = <70>;
atmel,self-chgtime-min = <70>;
atmel,self-chgtime-max = <100>;
atmel,mult-intthr-sensitive = <12>;
atmel,mult-intthr-not-sensitive = <20>;
atmel,atchthr-sensitive = <6>;
atmel,mult-tchthr-sensitive = <0x3C>;
atmel,mult-tchthr-not-sensitive = <0x20>;
};
atmel,cfg_4 {
atmel,family-id = <0x82>;
atmel,variant-id = <0x2C>;
atmel,version = <0x30>;
atmel,build = <0xAA>;
atmel,mxt-cfg-name = "mxt_wintek_diamond_config_v30_lg.fw";
atmel,vendor-id = <0x04>;
atmel,rev-id = <0x00>;
atmel,lcd-id = <0x01>;
atmel,key-codes = <158 102 139>;
atmel,key-num = <3>;
atmel,selfthr-suspend = <51>;
atmel,selfintthr-stylus = <12>;
atmel,selfintthr-suspend = <8>;
atmel,t71-tchthr-pos = <22>;
atmel,self-no-touch-threshold = <220>;
atmel,mult-no-touch-threshold = <70>;
atmel,self-chgtime-min = <70>;
atmel,self-chgtime-max = <100>;
atmel,mult-intthr-sensitive = <12>;
atmel,mult-intthr-not-sensitive = <20>;
atmel,atchthr-sensitive = <6>;
atmel,mult-tchthr-sensitive = <0x3C>;
atmel,mult-tchthr-not-sensitive = <0x20>;
};
};
};

i2c@f9928000 {
bcm2079x-i2c {
compatible = "broadcom,bcm2079x-i2c";
Expand Down

0 comments on commit 1b4a683

Please sign in to comment.