From cbe8b25c1da2ecf3fa83fcc863fd8b80774f69a8 Mon Sep 17 00:00:00 2001
From: Rex Lin <rexcylin@google.com>
Date: Thu, 21 Jul 2022 12:48:35 +0800
Subject: [PATCH 1/2] uwb: support per device calibration for F10

Bug: 239674697
Test: Verified with local build
Signed-off-by: Rex Lin <rexcylin@google.com>
Change-Id: Ieb9651c231ec9901eae6993fc4ccee35eecccfb4
---
 device-felix.mk            |  1 -
 uwb/init.uwb.calib.xtal.sh | 26 ++++++++++++++++++++++++++
 uwb/uwb_calibration.mk     | 13 ++++++++++---
 3 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 uwb/init.uwb.calib.xtal.sh

diff --git a/device-felix.mk b/device-felix.mk
index 43091f0..7da0daa 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -32,7 +32,6 @@ $(call soong_config_set,fp_hal_feature,pixel_product, product_a)
 include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk
 include device/google/gs101/bluetooth/bluetooth.mk
 ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),)
-include device/google/gs101/uwb/uwb.mk
 include device/google/felix/uwb/uwb_calibration.mk
 endif
 
diff --git a/uwb/init.uwb.calib.xtal.sh b/uwb/init.uwb.calib.xtal.sh
new file mode 100644
index 0000000..1fcb876
--- /dev/null
+++ b/uwb/init.uwb.calib.xtal.sh
@@ -0,0 +1,26 @@
+#!/vendor/bin/sh
+# only use xtal_trim from factory calibration
+if [ -z "$2" ]
+then
+    echo "usage is $0 input-calibration output_calibration"
+    exit 0
+fi
+OUTPUT_CALIB="$2"
+if [ ! -f "$OUTPUT_CALIB" ]; then
+    touch $OUTPUT_CALIB
+    chmod 0644 $OUTPUT_CALIB
+    file="$1"
+    while IFS=, read -r f1 f2
+    do
+        case $f1 in
+            "UWB_cal_tx_xtal_reg_final_value")
+                if [ $((0x$f2)) -gt 63 ]; then
+                    f2=63
+                fi
+                echo 'xtal_trim=0x'$f2 >> $OUTPUT_CALIB
+                ;;
+        esac
+    done <"$file"
+    exit 0
+fi
+
diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
index d2340e7..849e154 100644
--- a/uwb/uwb_calibration.mk
+++ b/uwb/uwb_calibration.mk
@@ -13,9 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# UWB - ultra wide band
+$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk)
+
 LOCAL_UWB_CAL_DIR=device/google/felix/uwb
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-unknown.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-default.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \
+    $(LOCAL_UWB_CAL_DIR)/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \
+
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.uwb.xml

From a0dd02d48efa58467dcc2f112d7e5995b9c619b6 Mon Sep 17 00:00:00 2001
From: jimmyshiu <jimmyshiu@google.com>
Date: Thu, 21 Jul 2022 01:37:46 +0000
Subject: [PATCH 2/2] Remove universal touch boost

Bug: 236781877
Test: PtsUiBench
Change-Id: Ic150bcf5ed8494fd696d1a8444fa86798621969e
Merged-In: Ic150bcf5ed8494fd696d1a8444fa86798621969e
---
 powerhint.json | 63 --------------------------------------------------
 1 file changed, 63 deletions(-)

diff --git a/powerhint.json b/powerhint.json
index e9b302f..58ac9e4 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -155,7 +155,6 @@
       "Path": "/proc/vendor_sched/ta_uclamp_min",
       "Values": [
         "612",
-        "185",
         "1",
         "63"
       ],
@@ -1337,58 +1336,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "ADPF_DISABLE_TA_BOOST",
-      "Type": "MaskHint",
-      "Value": "BOOST_DISPLAY"
-    },
-    {
-      "PowerHint": "ADPF_DISABLE_TA_BOOST",
-      "Type": "EndHint",
-      "Value": "BOOST_120HZ"
-    },
-    {
-      "PowerHint": "ADPF_DISABLE_TA_BOOST",
-      "Type": "EndHint",
-      "Value": "BOOST_60HZ"
-    },
-    {
-      "PowerHint": "BOOST_DISPLAY",
-      "Type": "DoHint",
-      "Value": "BOOST_120HZ"
-    },
-    {
-      "PowerHint": "BOOST_DISPLAY",
-      "Type": "DoHint",
-      "Value": "BOOST_60HZ"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Type": "DoHint",
-      "Value": "BOOST_DISPLAY"
-    },
-    {
-      "PowerHint": "BOOST_120HZ",
-      "Node": "TAUClampBoost",
-      "Duration": 200,
-      "Value": "185"
-    },
-    {
-      "PowerHint": "BOOST_60HZ",
-      "Node": "TAUClampBoost",
-      "Duration": 200,
-      "Value": "185"
-    },
-    {
-      "PowerHint": "REFRESH_120FPS",
-      "Type": "MaskHint",
-      "Value": "BOOST_60HZ"
-    },
-    {
-      "PowerHint": "REFRESH_60FPS",
-      "Type": "MaskHint",
-      "Value": "BOOST_120HZ"
-    },
     {
       "PowerHint": "DISPLAY_IDLE",
       "Node": "FGPreferIdle",
@@ -1406,16 +1353,6 @@
       "Type": "EndHint",
       "Value": "INTERACTION"
     },
-    {
-      "PowerHint": "DISPLAY_IDLE",
-      "Type": "EndHint",
-      "Value": "BOOST_120HZ"
-    },
-    {
-      "PowerHint": "DISPLAY_IDLE",
-      "Type": "EndHint",
-      "Value": "BOOST_60HZ"
-    },
     {
       "PowerHint": "DISPLAY_IDLE",
       "Type": "EndHint",