diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk index f633834..50a3f3f 100644 --- a/aosp_husky_pgagnostic.mk +++ b/aosp_husky_pgagnostic.mk @@ -22,4 +22,5 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_RW_FILE_SYSTEM_TYPE := ext4 TARGET_BOOTS_16K := true diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk index 0b23ed5..208ee17 100644 --- a/aosp_shiba_pgagnostic.mk +++ b/aosp_shiba_pgagnostic.mk @@ -22,4 +22,5 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_RW_FILE_SYSTEM_TYPE := ext4 TARGET_BOOTS_16K := true diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml index 4b747bb..b34566d 100644 --- a/audio/husky/aidl_config/audio_platform_configuration.xml +++ b/audio/husky/aidl_config/audio_platform_configuration.xml @@ -24,10 +24,13 @@ - + - + + + + @@ -47,7 +50,6 @@ - @@ -58,11 +60,12 @@ - + + @@ -71,8 +74,8 @@ - - + + @@ -89,18 +92,18 @@ + + MIC CAMCORDER - VOICE_RECOGNITION MIC CAMCORDER - VOICE_RECOGNITION diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index 9695f70..d970e8e 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -233,6 +233,7 @@ + @@ -256,10 +257,14 @@ - + + + + + @@ -307,6 +312,7 @@ + @@ -413,6 +419,10 @@ + + + + @@ -485,6 +495,10 @@ + + + + @@ -557,6 +571,10 @@ + + + + @@ -634,6 +652,10 @@ + + + + @@ -706,6 +728,10 @@ + + + + @@ -790,6 +816,10 @@ + + + + @@ -806,61 +836,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -882,6 +857,18 @@ + + + + + + + + + + + + @@ -902,6 +889,10 @@ + + + + @@ -972,6 +963,10 @@ + + + + @@ -1046,6 +1041,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1074,11 +1102,47 @@ - + - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1113,6 +1177,10 @@ + + + + @@ -1165,77 +1233,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -1249,7 +1249,6 @@ - @@ -1266,7 +1265,6 @@ - @@ -1275,36 +1273,35 @@ - - - - + - + + + + + - - - - + + + + + - - - - + @@ -1316,91 +1313,47 @@ - - - - - + + - - - - - - + + - + + + + + + + + + + + - - - - - - - + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + @@ -1411,9 +1364,7 @@ - - - + @@ -1428,6 +1379,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index 1506b4e..0929972 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -82,3 +82,13 @@ PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps endif + +ifeq ($(USE_AUDIO_HAL_AIDL),true) +# Offload spatializer config +PRODUCT_COPY_FILES += \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \ + +endif diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml index 3c403c1..6423daf 100644 --- a/audio/husky/config/audio_platform_configuration.xml +++ b/audio/husky/config/audio_platform_configuration.xml @@ -173,14 +173,14 @@ - - + + - - + + diff --git a/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file diff --git a/audio/husky/tuning/spatializer/base b/audio/husky/tuning/spatializer/base new file mode 100644 index 0000000..38cc646 Binary files /dev/null and b/audio/husky/tuning/spatializer/base differ diff --git a/audio/husky/tuning/spatializer/mode_2_ch b/audio/husky/tuning/spatializer/mode_2_ch new file mode 100644 index 0000000..470c56c Binary files /dev/null and b/audio/husky/tuning/spatializer/mode_2_ch differ diff --git a/audio/husky/tuning/spatializer/mode_6_ch b/audio/husky/tuning/spatializer/mode_6_ch new file mode 100644 index 0000000..94ec635 Binary files /dev/null and b/audio/husky/tuning/spatializer/mode_6_ch differ diff --git a/audio/husky/tuning/spatializer/mode_xaural b/audio/husky/tuning/spatializer/mode_xaural new file mode 100644 index 0000000..b3a3a96 Binary files /dev/null and b/audio/husky/tuning/spatializer/mode_xaural differ diff --git a/audio/ripcurrent/config/audio_platform_configuration.xml b/audio/ripcurrent/config/audio_platform_configuration.xml index 2435e98..4748e6f 100644 --- a/audio/ripcurrent/config/audio_platform_configuration.xml +++ b/audio/ripcurrent/config/audio_platform_configuration.xml @@ -179,8 +179,8 @@ - - + + diff --git a/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml index 4b747bb..b34566d 100644 --- a/audio/shiba/aidl_config/audio_platform_configuration.xml +++ b/audio/shiba/aidl_config/audio_platform_configuration.xml @@ -24,10 +24,13 @@ - + - + + + + @@ -47,7 +50,6 @@ - @@ -58,11 +60,12 @@ - + + @@ -71,8 +74,8 @@ - - + + @@ -89,18 +92,18 @@ + + MIC CAMCORDER - VOICE_RECOGNITION MIC CAMCORDER - VOICE_RECOGNITION diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index 9695f70..d970e8e 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -233,6 +233,7 @@ + @@ -256,10 +257,14 @@ - + + + + + @@ -307,6 +312,7 @@ + @@ -413,6 +419,10 @@ + + + + @@ -485,6 +495,10 @@ + + + + @@ -557,6 +571,10 @@ + + + + @@ -634,6 +652,10 @@ + + + + @@ -706,6 +728,10 @@ + + + + @@ -790,6 +816,10 @@ + + + + @@ -806,61 +836,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -882,6 +857,18 @@ + + + + + + + + + + + + @@ -902,6 +889,10 @@ + + + + @@ -972,6 +963,10 @@ + + + + @@ -1046,6 +1041,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1074,11 +1102,47 @@ - + - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1113,6 +1177,10 @@ + + + + @@ -1165,77 +1233,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -1249,7 +1249,6 @@ - @@ -1266,7 +1265,6 @@ - @@ -1275,36 +1273,35 @@ - - - - + - + + + + + - - - - + + + + + - - - - + @@ -1316,91 +1313,47 @@ - - - - - + + - - - - - - + + - + + + + + + + + + + + - - - - - - - + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + @@ -1411,9 +1364,7 @@ - - - + @@ -1428,6 +1379,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index dd809ee..ea4aa77 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -82,3 +82,13 @@ PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps endif + +ifeq ($(USE_AUDIO_HAL_AIDL),true) +# Offload spatializer config +PRODUCT_COPY_FILES += \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \ + +endif diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml index 3c403c1..6423daf 100644 --- a/audio/shiba/config/audio_platform_configuration.xml +++ b/audio/shiba/config/audio_platform_configuration.xml @@ -173,14 +173,14 @@ - - + + - - + + diff --git a/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file diff --git a/audio/shiba/tuning/spatializer/base b/audio/shiba/tuning/spatializer/base new file mode 100644 index 0000000..38cc646 Binary files /dev/null and b/audio/shiba/tuning/spatializer/base differ diff --git a/audio/shiba/tuning/spatializer/mode_2_ch b/audio/shiba/tuning/spatializer/mode_2_ch new file mode 100644 index 0000000..470c56c Binary files /dev/null and b/audio/shiba/tuning/spatializer/mode_2_ch differ diff --git a/audio/shiba/tuning/spatializer/mode_6_ch b/audio/shiba/tuning/spatializer/mode_6_ch new file mode 100644 index 0000000..94ec635 Binary files /dev/null and b/audio/shiba/tuning/spatializer/mode_6_ch differ diff --git a/audio/shiba/tuning/spatializer/mode_xaural b/audio/shiba/tuning/spatializer/mode_xaural new file mode 100644 index 0000000..b3a3a96 Binary files /dev/null and b/audio/shiba/tuning/spatializer/mode_xaural differ diff --git a/avf/Android.bp b/avf/Android.bp deleted file mode 100644 index d707db1..0000000 --- a/avf/Android.bp +++ /dev/null @@ -1,22 +0,0 @@ -// -// 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. - -prebuilt_etc { - name: "shusky_assignable_devices.xml", - src: "assignable_devices.xml", - filename: "assignable_devices.xml", - vendor: true, - relative_install_path: "avf", -} diff --git a/avf/assignable_devices.xml b/avf/assignable_devices.xml deleted file mode 100644 index baacffc..0000000 --- a/avf/assignable_devices.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - eh - eh - /sys/bus/platform/devices/16d00000.eh - - diff --git a/device-husky.mk b/device-husky.mk index 706f3e0..5f20ed7 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -17,6 +17,17 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_HUSKY_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR) +$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_HUSKY_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_HUSKY_DIR) @@ -61,10 +72,9 @@ endif include device/google/shusky/camera/camera.mk include device/google/shusky/audio/husky/audio-tables.mk include device/google/zuma/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -include device/google/gs-common/touch/stm/stm20.mk -include device/google/gs-common/touch/gti/gti.mk +include device/google/gs-common/touch/stm/predump_stm20.mk +include device/google/gs-common/touch/gti/predump_gti.mk include device/google/gs-common/touch/touchinspector/touchinspector.mk # Init files @@ -131,19 +141,27 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.finder.supported=true +ifeq ($(USE_AUDIO_HAL_AIDL),true) +# AIDL + +else +# HIDL + # Spatial Audio PRODUCT_PACKAGES += \ libspatialaudio -# declare use of spatial audio -PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.spatializer_enabled=true - # Sound Dose PRODUCT_PACKAGES += \ android.hardware.audio.sounddose-vendor-impl \ audio_sounddose_aoc +endif + +# declare use of spatial audio +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.spatializer_enabled=true + # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.cca.enabled=false @@ -484,9 +502,6 @@ PRODUCT_PRODUCT_PROPERTIES ?= \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true -# AVF assignable devices xml -PRODUCT_PACKAGES += shusky_assignable_devices.xml - # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true @@ -508,11 +523,15 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu endif PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true + +ifneq ($(wildcard vendor/arm/mali/valhall),) PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true +endif # Bluetooth device id +# Husky: 0x410D PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20493 + bluetooth.device_id.product_id=16653 # Set support for LEA multicodec PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index a399216..c963f0b 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -17,6 +17,11 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR) +$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RIPCURRENT_VERSION) TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RIPCURRENT_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RIPCURRENT_DIR)/kernel-headers @@ -40,7 +45,6 @@ CAMERA_PRODUCT ?= ripcurrent include device/google/shusky/audio/ripcurrent/audio-tables.mk include device/google/shusky/camera/camera.mk include device/google/zuma/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/touch/stm/stm20.mk diff --git a/device-shiba.mk b/device-shiba.mk index e052cd4..37a4b46 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -17,6 +17,17 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_SHIBA_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_SHIBA_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_SHIBA_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR) +$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_SHIBA_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_SHIBA_DIR) @@ -45,9 +56,8 @@ endif include device/google/shusky/camera/camera.mk include device/google/shusky/audio/shiba/audio-tables.mk include device/google/zuma/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -include device/google/gs-common/touch/gti/gti.mk +include device/google/gs-common/touch/gti/predump_gti.mk # Init files PRODUCT_COPY_FILES += \ @@ -119,19 +129,27 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.finder.supported=true +ifeq ($(USE_AUDIO_HAL_AIDL),true) +# AIDL + +else +# HIDL + # Spatial Audio PRODUCT_PACKAGES += \ libspatialaudio -# declare use of spatial audio -PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.spatializer_enabled=true - # Sound Dose PRODUCT_PACKAGES += \ android.hardware.audio.sounddose-vendor-impl \ audio_sounddose_aoc +endif + +# declare use of spatial audio +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.spatializer_enabled=true + # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.cca.enabled=false @@ -453,9 +471,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true -# AVF assignable devices xml -PRODUCT_PACKAGES += shusky_assignable_devices.xml - # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true @@ -477,11 +492,15 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu endif PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true + +ifneq ($(wildcard vendor/arm/mali/valhall),) PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true +endif # Bluetooth device id +# Shiba: 0x410E PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20492 + bluetooth.device_id.product_id=16654 # Set support for LEA multicodec PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index f387ff9..9240a13 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -26,16 +26,10 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := husky -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) -RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR) -$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)) - ifdef PHONE_CAR_BOARD_PRODUCT - include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk + include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else - TARGET_SCREEN_DENSITY := 480 + TARGET_SCREEN_DENSITY := 480 endif BOARD_USES_GENERIC_AUDIO := true @@ -51,6 +45,7 @@ include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/husky/proprietary/BoardConfigVendor.mk include device/google/shusky-sepolicy/husky-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml index c37151b..893d3ba 100644 --- a/husky/overlay/frameworks/base/core/res/res/values/config.xml +++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml @@ -32,6 +32,15 @@ 6 + + 35 + + + 25 + + + 50 + true diff --git a/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 5f36d8c..0680f65 100644 --- a/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -188,11 +188,11 @@ 3700 - 79 + 38 - 118 + 57 - 331 + 550 - 3700 + 3850 diff --git a/location/gps.6.1.xml.hk3 b/location/gps.6.1.xml.hk3 index 20329db..a0f4913 100644 --- a/location/gps.6.1.xml.hk3 +++ b/location/gps.6.1.xml.hk3 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" @@ -101,6 +102,8 @@ /> diff --git a/location/gps.6.1.xml.sb3 b/location/gps.6.1.xml.sb3 index a848fd9..5a7b48e 100644 --- a/location/gps.6.1.xml.sb3 +++ b/location/gps.6.1.xml.sb3 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" @@ -101,6 +102,8 @@ /> diff --git a/location/gps.xml b/location/gps.xml index 7441f38..4be8675 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3 index b238f9b..9774534 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" @@ -63,11 +64,13 @@ ReAidingOnHotStart="false" ReAidingIntervalSec="3600" RuntimeSwLteFilterEnable="true" + PpsDevice="/sys/devices/platform/bbd_pps/pps_assert" MaxThreadNum="13" SensorsMask="0x244" /> diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3 index 1abf8e2..a31af5d 100644 --- a/location/gps.xml.sb3 +++ b/location/gps.xml.sb3 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" @@ -63,11 +64,13 @@ ReAidingOnHotStart="false" ReAidingIntervalSec="3600" RuntimeSwLteFilterEnable="true" + PpsDevice="/sys/devices/platform/bbd_pps/pps_assert" MaxThreadNum="13" SensorsMask="0x244" /> diff --git a/location/gps_user.6.1.xml.hk3 b/location/gps_user.6.1.xml.hk3 index a6ddbce..b27f598 100644 --- a/location/gps_user.6.1.xml.hk3 +++ b/location/gps_user.6.1.xml.hk3 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" @@ -99,6 +100,8 @@ /> diff --git a/location/gps_user.6.1.xml.sb3 b/location/gps_user.6.1.xml.sb3 index 4248a7b..e715f27 100644 --- a/location/gps_user.6.1.xml.sb3 +++ b/location/gps_user.6.1.xml.sb3 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" @@ -99,6 +100,8 @@ /> diff --git a/location/gps_user.xml b/location/gps_user.xml index 292fa2b..215973a 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" @@ -97,6 +98,8 @@ /> diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3 index 3a0f045..e1fb9b9 100644 --- a/location/gps_user.xml.hk3 +++ b/location/gps_user.xml.hk3 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" @@ -61,11 +62,13 @@ ReAidingOnHotStart="false" ReAidingIntervalSec="3600" RuntimeSwLteFilterEnable="true" + PpsDevice="/sys/devices/platform/bbd_pps/pps_assert" MaxThreadNum="13" SensorsMask="0x244" /> diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3 index 463fd07..28bfb94 100644 --- a/location/gps_user.xml.sb3 +++ b/location/gps_user.xml.sb3 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="2" CpLppGuardTimeSec="2" IgnoreInjectedSystemTime="true" @@ -61,11 +62,13 @@ ReAidingOnHotStart="false" ReAidingIntervalSec="3600" RuntimeSwLteFilterEnable="true" + PpsDevice="/sys/devices/platform/bbd_pps/pps_assert" MaxThreadNum="13" SensorsMask="0x244" /> diff --git a/manifest.xml b/manifest.xml index e01d156..18109c6 100644 --- a/manifest.xml +++ b/manifest.xml @@ -48,15 +48,6 @@ default - - android.hardware.graphics.mapper - passthrough - 4.0 - - IMapper - default - - android.hardware.graphics.composer hwbinder diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index f464ced..64fa155 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -81,8 +81,8 @@ "Values": [ "9999999", "1098000", - "1475000", - "975000", + "1425000", + "955000", "1197000", "1328000", "1548000", @@ -96,7 +96,7 @@ "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", "Values": [ "9999999", - "1475000", + "1548000", "1197000", "0" ], @@ -118,16 +118,13 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Values": [ "9999999", - "2253000", + "2245000", "2130000", - "1082000", - "1221000", - "1418000", "910000", "1328000", - "1622000", + "1572000", "1836000", - "1999000" + "1945000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -137,10 +134,9 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", "Values": [ "9999999", - "2253000", + "2245000", "2130000", "1836000", - "1221000", "0" ], "ResetOnInit": true @@ -162,17 +158,13 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq", "Values": [ "9999999", - "2704000", - "2507000", - "2252000", - "893000", - "1328000", - "1852000", - "1164000", + "2687000", + "2147000", + "1298000", "1557000", "1745000", "2049000", - "2409000" + "2363000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -182,11 +174,10 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq", "Values": [ "9999999", - "2704000", - "2507000", - "2252000", - "1852000", - "1164000", + "2687000", + "2363000", + "2147000", + "1885000", "0" ], "ResetOnInit": true @@ -228,7 +219,6 @@ "0", "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -287,7 +277,7 @@ "Path": "/proc/vendor_sched/cpu_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, @@ -315,7 +305,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ - "765", + "720", "250", "0" ], @@ -436,7 +426,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -466,6 +455,15 @@ ], "ResetOnInit": true }, + { + "Name": "SysGroupCfsSkipMask", + "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", + "Values": [ + "0x0", + "0x100" + ], + "ResetOnInit": true + }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", @@ -473,7 +471,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -737,7 +734,7 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency", "Values": [ "2363000", - "1852000", + "1745000", "1298000" ], "DefaultIndex": 0 @@ -1341,7 +1338,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CPUBigClusterMinFreq", "Duration": 1000, - "Value": "1852000" + "Value": "1885000" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1365,13 +1362,13 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CPULittleClusterMinFreq", "Duration": 1000, - "Value": "1475000" + "Value": "1548000" }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1455,19 +1452,19 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 3000, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", "Duration": 3000, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -1485,7 +1482,7 @@ "PowerHint": "CAMERA_SHOT", "Node": "CAMUClampBoost", "Duration": 100, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_BACKEND_BOOST", @@ -1539,13 +1536,13 @@ "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "2704000" + "Value": "2687000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "CPUBigClusterMinFreq", "Duration": 3000, - "Value": "2704000" + "Value": "2687000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2", @@ -1557,13 +1554,13 @@ "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "2507000" + "Value": "2363000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2", "Node": "CPUBigClusterMinFreq", "Duration": 3000, - "Value": "2507000" + "Value": "2363000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3", @@ -1575,13 +1572,13 @@ "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "2252000" + "Value": "2147000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3", "Node": "CPUBigClusterMinFreq", "Duration": 3000, - "Value": "2252000" + "Value": "2147000" }, { "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK1", @@ -1599,13 +1596,13 @@ "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2", "Node": "CPUMidClusterMaxFreq", "Duration": 3000, - "Value": "2253000" + "Value": "2245000" }, { "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2", "Node": "CPUMidClusterMinFreq", "Duration": 3000, - "Value": "2253000" + "Value": "2245000" }, { "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK3", @@ -2253,19 +2250,19 @@ "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_STREAMING_LOW", @@ -2525,7 +2522,7 @@ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", "Node": "CPULittleClusterMaxFreq", "Duration": 3600000, - "Value": "975000" + "Value": "955000" }, { "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60", @@ -2567,7 +2564,7 @@ "PowerHint": "LOW_POWER_MID_CLUSTER_70", "Node": "CPUMidClusterMaxFreq", "Duration": 3600000, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "LOW_POWER_MID_CLUSTER_80", @@ -2579,13 +2576,13 @@ "PowerHint": "LOW_POWER_MID_CLUSTER_90", "Node": "CPUMidClusterMaxFreq", "Duration": 3600000, - "Value": "1999000" + "Value": "1945000" }, { "PowerHint": "LOW_POWER_CPU_50", "Node": "CPUBigClusterMaxFreq", "Duration": 3600000, - "Value": "1328000" + "Value": "1298000" }, { "PowerHint": "LOW_POWER_CPU_60", @@ -2609,7 +2606,7 @@ "PowerHint": "LOW_POWER_CPU_90", "Node": "CPUBigClusterMaxFreq", "Duration": 3600000, - "Value": "2409000" + "Value": "2363000" }, { "PowerHint": "LOW_POWER", @@ -2890,7 +2887,7 @@ "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMinFreq", "Duration": 500, - "Value": "1852000" + "Value": "1885000" }, { "PowerHint": "FACE_UNLOCK_BOOST", @@ -2992,7 +2989,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_BIG_LIMIT_FREQ", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_PROJECT11", @@ -3040,19 +3037,19 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_PROJECT11", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 1f2ae91..7a34efb 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -214,7 +214,6 @@ "0", "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -273,7 +272,7 @@ "Path": "/proc/vendor_sched/cpu_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, @@ -301,7 +300,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ - "765", + "720", "250", "0" ], @@ -422,7 +421,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -452,6 +450,15 @@ ], "ResetOnInit": true }, + { + "Name": "SysGroupCfsSkipMask", + "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", + "Values": [ + "0x0", + "0x100" + ], + "ResetOnInit": true + }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", @@ -459,7 +466,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -1347,7 +1353,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1443,7 +1449,7 @@ "PowerHint": "CAMERA_SHOT", "Node": "CAMUClampBoost", "Duration": 100, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_BACKEND_BOOST", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 26f7ea9..bccce89 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -81,8 +81,8 @@ "Values": [ "9999999", "1098000", - "1475000", - "975000", + "1425000", + "955000", "1197000", "1328000", "1548000", @@ -96,7 +96,7 @@ "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", "Values": [ "9999999", - "1475000", + "1548000", "1197000", "0" ], @@ -118,14 +118,11 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Values": [ "9999999", - "1082000", - "1221000", - "1418000", "910000", "1328000", - "1622000", + "1572000", "1836000", - "1999000" + "1945000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -136,7 +133,6 @@ "Values": [ "9999999", "1836000", - "1221000", "0" ], "ResetOnInit": true @@ -158,14 +154,11 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq", "Values": [ "9999999", - "893000", - "1328000", - "1852000", - "1164000", + "1298000", "1557000", "1745000", "2049000", - "2409000" + "2363000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -175,8 +168,7 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq", "Values": [ "9999999", - "1852000", - "1164000", + "1885000", "0" ], "ResetOnInit": true @@ -218,7 +210,6 @@ "0", "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -287,7 +278,7 @@ "Path": "/proc/vendor_sched/cpu_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, @@ -315,7 +306,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ - "765", + "720", "250", "0" ], @@ -436,7 +427,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -466,6 +456,15 @@ ], "ResetOnInit": true }, + { + "Name": "SysGroupCfsSkipMask", + "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", + "Values": [ + "0x0", + "0x100" + ], + "ResetOnInit": true + }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", @@ -473,7 +472,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -737,7 +735,7 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency", "Values": [ "2363000", - "1852000", + "1745000", "1298000" ], "DefaultIndex": 0 @@ -1347,7 +1345,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CPUBigClusterMinFreq", "Duration": 1000, - "Value": "1852000" + "Value": "1885000" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1371,13 +1369,13 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CPULittleClusterMinFreq", "Duration": 1000, - "Value": "1475000" + "Value": "1548000" }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1461,19 +1459,19 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 3000, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", "Duration": 3000, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -1491,7 +1489,7 @@ "PowerHint": "CAMERA_SHOT", "Node": "CAMUClampBoost", "Duration": 100, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_BACKEND_BOOST", @@ -2151,19 +2149,19 @@ "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_STREAMING_LOW", @@ -2429,7 +2427,7 @@ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", "Node": "CPULittleClusterMaxFreq", "Duration": 3600000, - "Value": "975000" + "Value": "955000" }, { "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60", @@ -2471,7 +2469,7 @@ "PowerHint": "LOW_POWER_MID_CLUSTER_70", "Node": "CPUMidClusterMaxFreq", "Duration": 3600000, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "LOW_POWER_MID_CLUSTER_80", @@ -2483,13 +2481,13 @@ "PowerHint": "LOW_POWER_MID_CLUSTER_90", "Node": "CPUMidClusterMaxFreq", "Duration": 3600000, - "Value": "1999000" + "Value": "1945000" }, { "PowerHint": "LOW_POWER_CPU_50", "Node": "CPUBigClusterMaxFreq", "Duration": 3600000, - "Value": "1328000" + "Value": "1298000" }, { "PowerHint": "LOW_POWER_CPU_60", @@ -2513,7 +2511,7 @@ "PowerHint": "LOW_POWER_CPU_90", "Node": "CPUBigClusterMaxFreq", "Duration": 3600000, - "Value": "2409000" + "Value": "2363000" }, { "PowerHint": "LOW_POWER", @@ -2794,7 +2792,7 @@ "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMinFreq", "Duration": 500, - "Value": "1852000" + "Value": "1885000" }, { "PowerHint": "FACE_UNLOCK_BOOST", @@ -2896,7 +2894,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_BIG_LIMIT_FREQ", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_PROJECT11", @@ -2944,19 +2942,19 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_PROJECT11", diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index 76f2b5d..142e21a 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -27,13 +27,10 @@ TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_SHUSKY := true -RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR) -$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)) - include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk include device/google/shusky-sepolicy/ripcurrent-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 8a5fb4b..847a288 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -26,12 +26,6 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := shiba -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) -RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR) -$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)) - ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else @@ -47,6 +41,7 @@ include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/shiba/proprietary/BoardConfigVendor.mk include device/google/shusky-sepolicy/shiba-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml index 5128d0d..fcbbc46 100644 --- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml +++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml @@ -32,6 +32,15 @@ 6 + + 35 + + + 25 + + + 50 + 0.0 diff --git a/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 5f36d8c..0680f65 100644 --- a/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -188,11 +188,11 @@ 3700 - 79 + 38 - 118 + 57 - 331 + 550 - 3700 + 3850 diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index 6212234..66b949d 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 32.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 33.7, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 47.2, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 48.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 31.7, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 44.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 34.6, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json index 539bcef..25fa05d 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 38.8, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 31.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 41.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 42.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 31.2, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 41.5, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 35.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index b53d46b..29c24cd 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 32.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 33.7, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 47.2, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 48.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 31.7, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 44.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 34.6, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index fb826fd..82c6fbc 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 38.8, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 31.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 41.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 42.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 31.2, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 41.5, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NaN", 35.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000