diff options
| author | Ben Fennema <fennema@google.com> | 2021-10-15 00:42:20 +0000 |
|---|---|---|
| committer | Ben Fennema <fennema@google.com> | 2021-10-15 00:49:49 +0000 |
| commit | 9d7781fdf1ef6477c00fb57738b0fc7197dd8cfe (patch) | |
| tree | ee628c14bbad9902a5c11b17b55f469ce0eaa03d | |
| parent | 8b511047f88bbe5315ba13f57139efdb2bfab6a2 (diff) | |
| download | devicetree-9d7781fdf1ef6477c00fb57738b0fc7197dd8cfe.tar.gz | |
Move nfc_active to novatek block
The code was originally copied from a previous CL that shared an
interrupt between novatek and nfc. For this particular CL, novatek is
the exclusive owner of the pin, so there is no need to put it as part of
the pinctrl.
The issue with having it part of the pinctrl is pinctrl_0 already has
the interrupt pin for haptics/smart amp, so just due to the loading
order this clobbered the haptics/smart amp interrupt causing it to be a
pull-down (on an active-low interrupt), which caused it to continuously
fire.
Bug: 203011584
Signed-off-by: Ben Fennema <fennema@google.com>
Change-Id: I67295b89f4914184885e71045c1803e94d398a74
| -rw-r--r-- | r11_novatek_touchscreen.dtsi | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/r11_novatek_touchscreen.dtsi b/r11_novatek_touchscreen.dtsi index 981230f..e73855b 100644 --- a/r11_novatek_touchscreen.dtsi +++ b/r11_novatek_touchscreen.dtsi @@ -14,15 +14,12 @@ novatek,irq-gpio =<&gpa0 5 GPIO_ACTIVE_LOW>; novatek,nfc-active-gpio = <&gpa1 4 0x00>; pinctrl-names = "default"; - pinctrl-0 = <&ts_int_active>; + pinctrl-0 = <&ts_int_active &nfc_active>; novatek,nfc-active-ms = <500>; }; }; &pinctrl_0 { - pinctrl-names = "default"; - pinctrl-0 = <&nfc_active>; - /* SOC_NFC_ZM_L */ nfc_active: nfc-active { samsung,pins = "gpa1-4"; |