diff options
| author | Joey Lin <linjoey@google.com> | 2023-01-03 10:45:07 +0000 |
|---|---|---|
| committer | Joey Lin <linjoey@google.com> | 2023-01-03 10:45:07 +0000 |
| commit | 979ec538bd0d9d3b0ed3d5aac5db0b53b6d42c8f (patch) | |
| tree | b5ab03e4234cb3e06d15240658790b98829d1858 | |
| parent | fbfc1da34c06a3d93be94d10cdf5207cc1fd9e03 (diff) | |
| parent | 8974836a6404cd27b65e5eed32d9abfa1ed68db5 (diff) | |
| download | tangorpro-979ec538bd0d9d3b0ed3d5aac5db0b53b6d42c8f.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udc
Bug: 255246572
Change-Id: Ie9933a72a276b3c5e01f44f79aa3f9c2974859f6
Signed-off-by: Joey Lin <linjoey@google.com>
| -rw-r--r-- | dts/gs201-pogo-transport.dtsi | 1 | ||||
| -rw-r--r-- | dts/gs201-tangorpro-common.dtsi | 3 | ||||
| -rw-r--r-- | dts/gs201-tangorpro-display-common.dtsi | 2 | ||||
| -rw-r--r-- | dts/gs201-tangorpro-touch.dtsi | 3 | ||||
| -rw-r--r-- | dts/gs201-tangorpro-usb.dtsi | 2 | ||||
| -rw-r--r-- | dts/gs201-tangorpro-uwb.dtsi | 16 |
6 files changed, 21 insertions, 6 deletions
diff --git a/dts/gs201-pogo-transport.dtsi b/dts/gs201-pogo-transport.dtsi index 368852f..3090c1b 100644 --- a/dts/gs201-pogo-transport.dtsi +++ b/dts/gs201-pogo-transport.dtsi @@ -38,7 +38,6 @@ pogo-hub-reset = <&gpp0 0 GPIO_ACTIVE_HIGH>; pogo-hub-sel = <&gpp2 0 GPIO_ACTIVE_HIGH>; - pogo-acc-capable; pogo-acc-detect = <&gpa8 2 GPIO_ACTIVE_HIGH>; usb-hub-supply = <&s_ldo28_reg>; diff --git a/dts/gs201-tangorpro-common.dtsi b/dts/gs201-tangorpro-common.dtsi index 0409b09..88fe2c2 100644 --- a/dts/gs201-tangorpro-common.dtsi +++ b/dts/gs201-tangorpro-common.dtsi @@ -16,8 +16,7 @@ #include "google-base/gs201-pantah-pmic.dtsi" -#include "google-base/gs201-ravenclaw-uwb.dtsi" - +#include "gs201-tangorpro-uwb.dtsi" #include "gs201-tangorpro-camera-pmic.dtsi" #include "gs201-tangorpro-camera.dtsi" #include "gs201-tangorpro-display.dtsi" diff --git a/dts/gs201-tangorpro-display-common.dtsi b/dts/gs201-tangorpro-display-common.dtsi index 449072f..a2bc1dd 100644 --- a/dts/gs201-tangorpro-display-common.dtsi +++ b/dts/gs201-tangorpro-display-common.dtsi @@ -7,7 +7,7 @@ */ /* 0: normal, 1: bottom up, 2: left up, 3: right up */ -orientation = <3>; +orientation = <0>; /* reset, power */ reset-gpios = <&gpa7 1 GPIO_ACTIVE_HIGH>; diff --git a/dts/gs201-tangorpro-touch.dtsi b/dts/gs201-tangorpro-touch.dtsi index fac6add..2b93d10 100644 --- a/dts/gs201-tangorpro-touch.dtsi +++ b/dts/gs201-tangorpro-touch.dtsi @@ -53,7 +53,8 @@ novatek,pen-support; novatek,wgp-stylus; - goog,wakeup-before-force-active-enabled; + goog,ignore-force-active; + goog,ignore-screenoff-heatmap; goog,default-grip-disabled; goog,default-palm-disabled; goog,offload-caps-cancel-reporting; diff --git a/dts/gs201-tangorpro-usb.dtsi b/dts/gs201-tangorpro-usb.dtsi index 094a7ff..5e1eaf6 100644 --- a/dts/gs201-tangorpro-usb.dtsi +++ b/dts/gs201-tangorpro-usb.dtsi @@ -16,7 +16,7 @@ hs_tune2 { tune_name = "tx_vref"; - tune_value = <0xf 0xf>; + tune_value = <0x9 0x9>; }; hs_tune3 { diff --git a/dts/gs201-tangorpro-uwb.dtsi b/dts/gs201-tangorpro-uwb.dtsi new file mode 100644 index 0000000..1bda693 --- /dev/null +++ b/dts/gs201-tangorpro-uwb.dtsi @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Tangorpro device tree source + * + * Copyright (c) 2022 Google, LLC + * https://www.google.com +*/ + +#include "google-base/gs201-ravenclaw-uwb.dtsi" + +&spi_16 { + dw3xxx_prod@0 { + min_clamp = <600>; + }; +}; + |