From 8431bf9e802192929c0b708fa5d5a33e6b2c80db Mon Sep 17 00:00:00 2001 From: Alan Chen Date: Wed, 22 Nov 2023 21:49:04 +0800 Subject: [PATCH] Add coex tables Bug: 306539165 Test: manual, files are read and parsed by coex Change-Id: Ie92f5ae0d23df336195b2a1adc26c6504fb46ff4 --- device-comet.mk | 9 +++ radio/coex/Android.bp | 65 +++++++++++++++++++ .../camera_front_inner_mipi_coex_table.csv | 13 ++++ .../camera_front_outer_mipi_coex_table.csv | 13 ++++ .../coex/camera_rear_tele_mipi_coex_table.csv | 4 ++ .../coex/camera_rear_wide_mipi_coex_table.csv | 5 ++ .../display_secondary_mipi_coex_table.csv | 7 ++ 7 files changed, 116 insertions(+) create mode 100644 radio/coex/Android.bp create mode 100644 radio/coex/camera_front_inner_mipi_coex_table.csv create mode 100644 radio/coex/camera_front_outer_mipi_coex_table.csv create mode 100644 radio/coex/camera_rear_tele_mipi_coex_table.csv create mode 100644 radio/coex/camera_rear_wide_mipi_coex_table.csv create mode 100644 radio/coex/display_secondary_mipi_coex_table.csv diff --git a/device-comet.mk b/device-comet.mk index 048cc2c..06532d1 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -67,6 +67,15 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_COPY_FILES += \ device/google/comet/display/display_colordata_cal1.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal1.pb +# Coex Config +PRODUCT_SOONG_NAMESPACES += device/google/comet/radio/coex +PRODUCT_PACKAGES += \ + display_secondary_mipi_coex_table \ + camera_front_inner_mipi_coex_table \ + camera_front_outer_mipi_coex_table \ + camera_rear_tele_mipi_coex_table \ + camera_rear_wide_mipi_coex_table + # NFC PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ diff --git a/radio/coex/Android.bp b/radio/coex/Android.bp new file mode 100644 index 0000000..f8d62d3 --- /dev/null +++ b/radio/coex/Android.bp @@ -0,0 +1,65 @@ +// Copyright (C) 2023 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 { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_google_comet_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_google_comet_license"], +} + +prebuilt_etc { + name: "display_secondary_mipi_coex_table", + filename: "display_secondary_mipi_coex_table.csv", + vendor: true, + src: "display_secondary_mipi_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_front_inner_mipi_coex_table", + filename: "camera_front_inner_mipi_coex_table.csv", + vendor: true, + src: "camera_front_inner_mipi_coex_table.csv", + relative_install_path: "modem", +} + +prebuilt_etc { + name: "camera_front_outer_mipi_coex_table", + filename: "camera_front_outer_mipi_coex_table.csv", + vendor: true, + src: "camera_front_outer_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/coex/camera_front_inner_mipi_coex_table.csv b/radio/coex/camera_front_inner_mipi_coex_table.csv new file mode 100644 index 0000000..a13a3d2 --- /dev/null +++ b/radio/coex/camera_front_inner_mipi_coex_table.csv @@ -0,0 +1,13 @@ +860000,918000 +SNH,860000 +802000,830000 +SNH,802000 + +635000,655000,918000 +724000,773000,918000 +850000,871000,918000 +2452000,2492000,918000 +5570000,5610000,918000 +788000,816000,830000 +2386000,2426000,830000 +5193000,5233000,830000 \ No newline at end of file diff --git a/radio/coex/camera_front_outer_mipi_coex_table.csv b/radio/coex/camera_front_outer_mipi_coex_table.csv new file mode 100644 index 0000000..a13a3d2 --- /dev/null +++ b/radio/coex/camera_front_outer_mipi_coex_table.csv @@ -0,0 +1,13 @@ +860000,918000 +SNH,860000 +802000,830000 +SNH,802000 + +635000,655000,918000 +724000,773000,918000 +850000,871000,918000 +2452000,2492000,918000 +5570000,5610000,918000 +788000,816000,830000 +2386000,2426000,830000 +5193000,5233000,830000 \ No newline at end of file diff --git a/radio/coex/camera_rear_tele_mipi_coex_table.csv b/radio/coex/camera_rear_tele_mipi_coex_table.csv new file mode 100644 index 0000000..fa77ac4 --- /dev/null +++ b/radio/coex/camera_rear_tele_mipi_coex_table.csv @@ -0,0 +1,4 @@ +1665000,1825000 +SNH,1665000 + +5800000,5850000,1825000 \ No newline at end of file diff --git a/radio/coex/camera_rear_wide_mipi_coex_table.csv b/radio/coex/camera_rear_wide_mipi_coex_table.csv new file mode 100644 index 0000000..26be26e --- /dev/null +++ b/radio/coex/camera_rear_wide_mipi_coex_table.csv @@ -0,0 +1,5 @@ +1753000,1794000 +SNH,1753000 + +866000,886000,1794000 +2442000,2448000,1794000 \ No newline at end of file diff --git a/radio/coex/display_secondary_mipi_coex_table.csv b/radio/coex/display_secondary_mipi_coex_table.csv new file mode 100644 index 0000000..dcba6dc --- /dev/null +++ b/radio/coex/display_secondary_mipi_coex_table.csv @@ -0,0 +1,7 @@ +432500,378000 +SNH,432500 +CHA,432500 + +642000,654000,378000 +855000,875000,378000 +2152000,2170000,378000 \ No newline at end of file