diff options
| author | Ben Fennema <fennema@google.com> | 2021-09-09 01:07:47 +0000 |
|---|---|---|
| committer | Ben Fennema <fennema@google.com> | 2021-09-09 16:40:58 +0000 |
| commit | 46c38f640649488fb7594bb847235916c5e01cf8 (patch) | |
| tree | 0e3c2effadbc644b4600867e945c9d7cce5f868e | |
| parent | 775005663f8560fd83214c321c98a05961569bd3 (diff) | |
| download | devicetree-46c38f640649488fb7594bb847235916c5e01cf8.tar.gz | |
Revert "Add NFC idle gpio to the touchscreen DT"
Revert submission 1986244-r11-nfc-disables-touch
Reason for revert: This causes about a 4s disabling of touch on screen off/screen on.
Reverted Changes:
I6543cc80d:Ignore touch events when NFC is active
Icd8564d4f:Add NFC idle gpio to the touchscreen DT
Bug: 192429087
Change-Id: I39723d3f3358725165ef065ac8ae26488451c009
| -rw-r--r-- | r11_novatek_touchscreen.dtsi | 1 | ||||
| -rw-r--r-- | r11_st21_nfc.dtsi | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/r11_novatek_touchscreen.dtsi b/r11_novatek_touchscreen.dtsi index d6b50b2..e3c81c9 100644 --- a/r11_novatek_touchscreen.dtsi +++ b/r11_novatek_touchscreen.dtsi @@ -12,7 +12,6 @@ status = "disabled"; novatek,irq-gpio =<&gpa0 5 GPIO_ACTIVE_LOW>; - nfc-idle-gpio = <&gpg0 1 0x00>; pinctrl-names = "default"; pinctrl-0 = <&ts_int_active>; }; diff --git a/r11_st21_nfc.dtsi b/r11_st21_nfc.dtsi index 13d69d4..521b921 100644 --- a/r11_st21_nfc.dtsi +++ b/r11_st21_nfc.dtsi @@ -31,7 +31,7 @@ clock-names = "nfc_ref_clk"; st,clk_pinctrl; pinctrl-names = "default"; - pinctrl-0 = <&nfc_irq &nfc_clkreq &nfc_nreset>; + pinctrl-0 = <&nfc_irq &nfc_clkreq &nfc_nreset &nfc_pidle>; status = "ok"; }; }; @@ -59,9 +59,6 @@ }; &pinctrl_5 { - pinctrl-names = "default"; - pinctrl-0 = <&nfc_pidle>; - /* SOC_NFC_RST_L */ nfc_nreset: nfc-nreset { samsung,pins = "gpg1-0"; |