From 4bb91b6d54f2f97726a488ad7ae5bc0549e8c9f6 Mon Sep 17 00:00:00 2001 From: Alan Chen Date: Thu, 25 Jan 2024 21:51:06 +0800 Subject: [PATCH] Add camera coex tables Bug: 322263590 Test: manual, files are on the devices Change-Id: Ia6461835ae2f231d26a9d636f07c18a6a06d48e4 --- device-caiman.mk | 9 +++ device-komodo.mk | 9 +++ device-tokay.mk | 8 +++ radio/caiman/coex/Android.bp | 61 +++++++++++++++++++ .../coex/camera_front_mipi_coex_table.csv | 7 +++ .../coex/camera_rear_main_dbr_coex_table.csv | 4 ++ .../coex/camera_rear_main_mipi_coex_table.csv | 8 +++ .../coex/camera_rear_tele_mipi_coex_table.csv | 7 +++ .../coex/camera_rear_wide_mipi_coex_table.csv | 5 ++ radio/komodo/coex/Android.bp | 61 +++++++++++++++++++ .../coex/camera_front_mipi_coex_table.csv | 7 +++ .../coex/camera_rear_main_dbr_coex_table.csv | 4 ++ .../coex/camera_rear_main_mipi_coex_table.csv | 8 +++ .../coex/camera_rear_tele_mipi_coex_table.csv | 7 +++ .../coex/camera_rear_wide_mipi_coex_table.csv | 5 ++ radio/tokay/coex/Android.bp | 53 ++++++++++++++++ .../coex/camera_front_dbr_coex_table.csv | 21 +++++++ .../coex/camera_front_mipi_coex_table.csv | 20 ++++++ .../coex/camera_rear_main_mipi_coex_table.csv | 10 +++ .../coex/camera_rear_wide_mipi_coex_table.csv | 6 ++ 20 files changed, 320 insertions(+) create mode 100644 radio/caiman/coex/Android.bp create mode 100644 radio/caiman/coex/camera_front_mipi_coex_table.csv create mode 100644 radio/caiman/coex/camera_rear_main_dbr_coex_table.csv create mode 100644 radio/caiman/coex/camera_rear_main_mipi_coex_table.csv create mode 100644 radio/caiman/coex/camera_rear_tele_mipi_coex_table.csv create mode 100644 radio/caiman/coex/camera_rear_wide_mipi_coex_table.csv create mode 100644 radio/komodo/coex/Android.bp create mode 100644 radio/komodo/coex/camera_front_mipi_coex_table.csv create mode 100644 radio/komodo/coex/camera_rear_main_dbr_coex_table.csv create mode 100644 radio/komodo/coex/camera_rear_main_mipi_coex_table.csv create mode 100644 radio/komodo/coex/camera_rear_tele_mipi_coex_table.csv create mode 100644 radio/komodo/coex/camera_rear_wide_mipi_coex_table.csv create mode 100644 radio/tokay/coex/Android.bp create mode 100644 radio/tokay/coex/camera_front_dbr_coex_table.csv create mode 100644 radio/tokay/coex/camera_front_mipi_coex_table.csv create mode 100644 radio/tokay/coex/camera_rear_main_mipi_coex_table.csv create mode 100644 radio/tokay/coex/camera_rear_wide_mipi_coex_table.csv diff --git a/device-caiman.mk b/device-caiman.mk index 7ebe190b..89773c8c 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -93,6 +93,15 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +# Coex Config +PRODUCT_SOONG_NAMESPACES += device/google/caimito/radio/caiman/coex +PRODUCT_PACKAGES += \ + camera_front_mipi_coex_table \ + camera_rear_main_dbr_coex_table \ + camera_rear_main_mipi_coex_table \ + camera_rear_tele_mipi_coex_table \ + camera_rear_wide_mipi_coex_table + # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv diff --git a/device-komodo.mk b/device-komodo.mk index de35ad70..8778f3a0 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -111,6 +111,15 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +# Coex Config +PRODUCT_SOONG_NAMESPACES += device/google/caimito/radio/komodo/coex +PRODUCT_PACKAGES += \ + camera_front_mipi_coex_table \ + camera_rear_main_dbr_coex_table \ + camera_rear_main_mipi_coex_table \ + camera_rear_tele_mipi_coex_table \ + camera_rear_wide_mipi_coex_table + # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv diff --git a/device-tokay.mk b/device-tokay.mk index d0d2dfdf..0592a63f 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -88,6 +88,14 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +# Coex Config +PRODUCT_SOONG_NAMESPACES += device/google/caimito/radio/tokay/coex +PRODUCT_PACKAGES += \ + camera_front_dbr_coex_table \ + camera_front_mipi_coex_table \ + camera_rear_main_mipi_coex_table \ + camera_rear_wide_mipi_coex_table + # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv diff --git a/radio/caiman/coex/Android.bp b/radio/caiman/coex/Android.bp new file mode 100644 index 00000000..d74de12c --- /dev/null +++ b/radio/caiman/coex/Android.bp @@ -0,0 +1,61 @@ +// +// Copyright (C) 2024 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +soong_namespace { +} + +package { + default_applicable_licenses: ["device_google_caimito_license"], +} + +prebuilt_etc { + name: "camera_front_mipi_coex_table", + filename: "camera_front_mipi_coex_table.csv", + vendor: true, + src: "camera_front_mipi_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_rear_main_dbr_coex_table", + filename: "camera_rear_main_dbr_coex_table.csv", + vendor: true, + src: "camera_rear_main_dbr_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_rear_main_mipi_coex_table", + filename: "camera_rear_main_mipi_coex_table.csv", + vendor: true, + src: "camera_rear_main_mipi_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_rear_tele_mipi_coex_table", + filename: "camera_rear_tele_mipi_coex_table.csv", + vendor: true, + src: "camera_rear_tele_mipi_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_rear_wide_mipi_coex_table", + filename: "camera_rear_wide_mipi_coex_table.csv", + vendor: true, + src: "camera_rear_wide_mipi_coex_table.csv", + relative_install_path: "modem", +} diff --git a/radio/caiman/coex/camera_front_mipi_coex_table.csv b/radio/caiman/coex/camera_front_mipi_coex_table.csv new file mode 100644 index 00000000..eba04fa7 --- /dev/null +++ b/radio/caiman/coex/camera_front_mipi_coex_table.csv @@ -0,0 +1,7 @@ +2600000,1962000 + +1957000,1967000,2600000 +3919000,3929000,2600000 +5881000,5891000,2600000 +2595000,2605000,1962000 +5195000,5205000,1962000 \ No newline at end of file diff --git a/radio/caiman/coex/camera_rear_main_dbr_coex_table.csv b/radio/caiman/coex/camera_rear_main_dbr_coex_table.csv new file mode 100644 index 00000000..85122d98 --- /dev/null +++ b/radio/caiman/coex/camera_rear_main_dbr_coex_table.csv @@ -0,0 +1,4 @@ +258000,274000 + +2333000,2337000,258000 +2318000,2322000,274000 \ No newline at end of file diff --git a/radio/caiman/coex/camera_rear_main_mipi_coex_table.csv b/radio/caiman/coex/camera_rear_main_mipi_coex_table.csv new file mode 100644 index 00000000..9044453d --- /dev/null +++ b/radio/caiman/coex/camera_rear_main_mipi_coex_table.csv @@ -0,0 +1,8 @@ +2719000,2866000 + +2110000,2120000,2719000 +2381000,2391000,2719000 +2519000,2529000,2719000 +3613000,3623000,2719000 +4025000,4035000,2719000 +1997000,2007000,2866000 \ No newline at end of file diff --git a/radio/caiman/coex/camera_rear_tele_mipi_coex_table.csv b/radio/caiman/coex/camera_rear_tele_mipi_coex_table.csv new file mode 100644 index 00000000..31926afe --- /dev/null +++ b/radio/caiman/coex/camera_rear_tele_mipi_coex_table.csv @@ -0,0 +1,7 @@ +2699000,2398000 + +2390000,2400000,2699000 +3595000,3605000,2699000 +4043000,4053000,2398000 +6570000,6580000,2398000 +6750000,6760000,2398000 \ No newline at end of file diff --git a/radio/caiman/coex/camera_rear_wide_mipi_coex_table.csv b/radio/caiman/coex/camera_rear_wide_mipi_coex_table.csv new file mode 100644 index 00000000..6703498d --- /dev/null +++ b/radio/caiman/coex/camera_rear_wide_mipi_coex_table.csv @@ -0,0 +1,5 @@ +2600000,1962000 + +1957000,1967000,2600000 +3917000,3927000,2600000 +2595000,2605000,1962000 \ No newline at end of file diff --git a/radio/komodo/coex/Android.bp b/radio/komodo/coex/Android.bp new file mode 100644 index 00000000..d74de12c --- /dev/null +++ b/radio/komodo/coex/Android.bp @@ -0,0 +1,61 @@ +// +// Copyright (C) 2024 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +soong_namespace { +} + +package { + default_applicable_licenses: ["device_google_caimito_license"], +} + +prebuilt_etc { + name: "camera_front_mipi_coex_table", + filename: "camera_front_mipi_coex_table.csv", + vendor: true, + src: "camera_front_mipi_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_rear_main_dbr_coex_table", + filename: "camera_rear_main_dbr_coex_table.csv", + vendor: true, + src: "camera_rear_main_dbr_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_rear_main_mipi_coex_table", + filename: "camera_rear_main_mipi_coex_table.csv", + vendor: true, + src: "camera_rear_main_mipi_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_rear_tele_mipi_coex_table", + filename: "camera_rear_tele_mipi_coex_table.csv", + vendor: true, + src: "camera_rear_tele_mipi_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_rear_wide_mipi_coex_table", + filename: "camera_rear_wide_mipi_coex_table.csv", + vendor: true, + src: "camera_rear_wide_mipi_coex_table.csv", + relative_install_path: "modem", +} diff --git a/radio/komodo/coex/camera_front_mipi_coex_table.csv b/radio/komodo/coex/camera_front_mipi_coex_table.csv new file mode 100644 index 00000000..eba04fa7 --- /dev/null +++ b/radio/komodo/coex/camera_front_mipi_coex_table.csv @@ -0,0 +1,7 @@ +2600000,1962000 + +1957000,1967000,2600000 +3919000,3929000,2600000 +5881000,5891000,2600000 +2595000,2605000,1962000 +5195000,5205000,1962000 \ No newline at end of file diff --git a/radio/komodo/coex/camera_rear_main_dbr_coex_table.csv b/radio/komodo/coex/camera_rear_main_dbr_coex_table.csv new file mode 100644 index 00000000..85122d98 --- /dev/null +++ b/radio/komodo/coex/camera_rear_main_dbr_coex_table.csv @@ -0,0 +1,4 @@ +258000,274000 + +2333000,2337000,258000 +2318000,2322000,274000 \ No newline at end of file diff --git a/radio/komodo/coex/camera_rear_main_mipi_coex_table.csv b/radio/komodo/coex/camera_rear_main_mipi_coex_table.csv new file mode 100644 index 00000000..9044453d --- /dev/null +++ b/radio/komodo/coex/camera_rear_main_mipi_coex_table.csv @@ -0,0 +1,8 @@ +2719000,2866000 + +2110000,2120000,2719000 +2381000,2391000,2719000 +2519000,2529000,2719000 +3613000,3623000,2719000 +4025000,4035000,2719000 +1997000,2007000,2866000 \ No newline at end of file diff --git a/radio/komodo/coex/camera_rear_tele_mipi_coex_table.csv b/radio/komodo/coex/camera_rear_tele_mipi_coex_table.csv new file mode 100644 index 00000000..31926afe --- /dev/null +++ b/radio/komodo/coex/camera_rear_tele_mipi_coex_table.csv @@ -0,0 +1,7 @@ +2699000,2398000 + +2390000,2400000,2699000 +3595000,3605000,2699000 +4043000,4053000,2398000 +6570000,6580000,2398000 +6750000,6760000,2398000 \ No newline at end of file diff --git a/radio/komodo/coex/camera_rear_wide_mipi_coex_table.csv b/radio/komodo/coex/camera_rear_wide_mipi_coex_table.csv new file mode 100644 index 00000000..6703498d --- /dev/null +++ b/radio/komodo/coex/camera_rear_wide_mipi_coex_table.csv @@ -0,0 +1,5 @@ +2600000,1962000 + +1957000,1967000,2600000 +3917000,3927000,2600000 +2595000,2605000,1962000 \ No newline at end of file diff --git a/radio/tokay/coex/Android.bp b/radio/tokay/coex/Android.bp new file mode 100644 index 00000000..6fe492cf --- /dev/null +++ b/radio/tokay/coex/Android.bp @@ -0,0 +1,53 @@ +// +// Copyright (C) 2024 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +soong_namespace { +} + +package { + default_applicable_licenses: ["device_google_caimito_license"], +} + +prebuilt_etc { + name: "camera_front_dbr_coex_table", + filename: "camera_front_dbr_coex_table.csv", + vendor: true, + src: "camera_front_dbr_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_front_mipi_coex_table", + filename: "camera_front_mipi_coex_table.csv", + vendor: true, + src: "camera_front_mipi_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_rear_main_mipi_coex_table", + filename: "camera_rear_main_mipi_coex_table.csv", + vendor: true, + src: "camera_rear_main_mipi_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_rear_wide_mipi_coex_table", + filename: "camera_rear_wide_mipi_coex_table.csv", + vendor: true, + src: "camera_rear_wide_mipi_coex_table.csv", + relative_install_path: "modem", +} diff --git a/radio/tokay/coex/camera_front_dbr_coex_table.csv b/radio/tokay/coex/camera_front_dbr_coex_table.csv new file mode 100644 index 00000000..9d7b00e8 --- /dev/null +++ b/radio/tokay/coex/camera_front_dbr_coex_table.csv @@ -0,0 +1,21 @@ +126380,202200 + +806000,813000,126380 +1817000,1821000,126380 +2424000,2428000,126380 +2626000,2630000,126380 +3435000,3439000,126380 +3637000,3641000,126380 +3840000,3844000,126380 +629000,633000,202200 +756000,760000,202200 +883000,887000,202200 +1893000,1897000,202200 +2146000,2150000,202200 +2525000,2529000,202200 +2652000,2656000,202200 +3410000,3414000,202200 +3536000,3540000,202200 +3663000,3667000,202200 +3789000,3793000,202200 +3915000,3919000,202200 \ No newline at end of file diff --git a/radio/tokay/coex/camera_front_mipi_coex_table.csv b/radio/tokay/coex/camera_front_mipi_coex_table.csv new file mode 100644 index 00000000..e9fb8476 --- /dev/null +++ b/radio/tokay/coex/camera_front_mipi_coex_table.csv @@ -0,0 +1,20 @@ +1628000,1665000 + +619000,629000,1628000 +1868000,1878000,1628000 +2492000,2502000,1628000 +3325000,3335000,1628000 +3533000,3543000,1628000 +3741000,3751000,1628000 +3949000,3959000,1628000 +4157000,4167000,1628000 +4990000,4500000,1628000 +5822000,5832000,1628000 +6655000,6665000,1628000 +809000,819000,1665000 +2437000,2447000,1665000 +3658000,3668000,1665000 +4065000,4075000,1665000 +4879000,4889000,1665000 +5693000,5703000,1665000 +6507000,6517000,1665000 \ No newline at end of file diff --git a/radio/tokay/coex/camera_rear_main_mipi_coex_table.csv b/radio/tokay/coex/camera_rear_main_mipi_coex_table.csv new file mode 100644 index 00000000..a15d4c63 --- /dev/null +++ b/radio/tokay/coex/camera_rear_main_mipi_coex_table.csv @@ -0,0 +1,10 @@ +2719000,2866000 + +2110000,2120000,2719000 +2381000,2391000,2719000 +2519000,2529000,2719000 +2656000,2666000,2719000 +3613000,3623000,2719000 +4025000,4035000,2719000 +6890000,6990000,2719000 +1997000,2007000,2866000 \ No newline at end of file diff --git a/radio/tokay/coex/camera_rear_wide_mipi_coex_table.csv b/radio/tokay/coex/camera_rear_wide_mipi_coex_table.csv new file mode 100644 index 00000000..b86d944a --- /dev/null +++ b/radio/tokay/coex/camera_rear_wide_mipi_coex_table.csv @@ -0,0 +1,6 @@ +2600000,1962000 + +1957000,1967000,2600000 +3917000,3927000,2600000 +2595000,2605000,1962000 +5195000,5205000,1962000 \ No newline at end of file