From cd43eae838d166f11ad07d0ac90af28d3da9e3c9 Mon Sep 17 00:00:00 2001 From: vincenttew Date: Tue, 30 Apr 2024 18:24:53 +0800 Subject: [PATCH 1/6] audio: remove non-supported analog headset Bug: 329470379 Change-Id: Id63337a22b584e044e15a36fda34c5cdea9282af Signed-off-by: vincenttew --- .../audio_policy_configuration_a2dp_offload_disabled.xml | 6 ------ .../audio_policy_configuration_bluetooth_legacy_hal.xml | 6 ------ .../audio_policy_configuration_le_offload_disabled.xml | 6 ------ .../audio_policy_configuration_a2dp_offload_disabled.xml | 6 ------ .../audio_policy_configuration_bluetooth_legacy_hal.xml | 6 ------ .../audio_policy_configuration_le_offload_disabled.xml | 6 ------ .../audio_policy_configuration_a2dp_offload_disabled.xml | 6 ------ .../audio_policy_configuration_bluetooth_legacy_hal.xml | 6 ------ .../audio_policy_configuration_le_offload_disabled.xml | 6 ------ 9 files changed, 54 deletions(-) diff --git a/audio/caiman/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/caiman/config/audio_policy_configuration_a2dp_offload_disabled.xml index 6fa1bedd..552618c2 100644 --- a/audio/caiman/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/caiman/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -134,10 +134,6 @@ - - - - @@ -157,8 +153,6 @@ - - diff --git a/audio/caiman/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/caiman/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 3aa119e3..54a4bc58 100644 --- a/audio/caiman/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/caiman/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -130,10 +130,6 @@ - - - - @@ -153,8 +149,6 @@ - - diff --git a/audio/caiman/config/audio_policy_configuration_le_offload_disabled.xml b/audio/caiman/config/audio_policy_configuration_le_offload_disabled.xml index 9f20ecbc..91fa6801 100644 --- a/audio/caiman/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/caiman/config/audio_policy_configuration_le_offload_disabled.xml @@ -134,10 +134,6 @@ - - - - @@ -157,8 +153,6 @@ - - - - - - @@ -157,8 +153,6 @@ - - diff --git a/audio/komodo/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/komodo/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 3aa119e3..54a4bc58 100644 --- a/audio/komodo/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/komodo/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -130,10 +130,6 @@ - - - - @@ -153,8 +149,6 @@ - - diff --git a/audio/komodo/config/audio_policy_configuration_le_offload_disabled.xml b/audio/komodo/config/audio_policy_configuration_le_offload_disabled.xml index 9f20ecbc..91fa6801 100644 --- a/audio/komodo/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/komodo/config/audio_policy_configuration_le_offload_disabled.xml @@ -134,10 +134,6 @@ - - - - @@ -157,8 +153,6 @@ - - - - - - @@ -157,8 +153,6 @@ - - diff --git a/audio/tokay/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/tokay/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 3aa119e3..54a4bc58 100644 --- a/audio/tokay/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/tokay/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -130,10 +130,6 @@ - - - - @@ -153,8 +149,6 @@ - - diff --git a/audio/tokay/config/audio_policy_configuration_le_offload_disabled.xml b/audio/tokay/config/audio_policy_configuration_le_offload_disabled.xml index 9f20ecbc..91fa6801 100644 --- a/audio/tokay/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/tokay/config/audio_policy_configuration_le_offload_disabled.xml @@ -134,10 +134,6 @@ - - - - @@ -157,8 +153,6 @@ - - Date: Tue, 30 Apr 2024 20:42:52 +0800 Subject: [PATCH 2/6] thermal: Expose VCharge-Sensors with throttling Expose virtual charge sensors to which throttling is binded to and hide those which don't have. Unhide: - VIRTUAL-SKIN-CHARGE-WIRED - VIRTUAL-SKIN-CHARGE-PERSIST Hide: - VIRTUAL-SKIN-CHARGE Bug: 336193005 Test: Verify dumpsys Change-Id: I4d83f6af17fccb7de8d053c9d981163c9dde0ea3 --- thermal/thermal_info_config_caiman.json | 3 +-- thermal/thermal_info_config_caiman_proto.json | 1 + thermal/thermal_info_config_caiman_wingboard.json | 1 + thermal/thermal_info_config_charge_caiman.json | 3 +-- thermal/thermal_info_config_charge_komodo.json | 3 +-- thermal/thermal_info_config_charge_tokay.json | 3 +-- thermal/thermal_info_config_komodo.json | 3 +-- thermal/thermal_info_config_komodo_proto.json | 1 + thermal/thermal_info_config_komodo_wingboard.json | 1 + thermal/thermal_info_config_tokay.json | 3 +-- thermal/thermal_info_config_tokay_proto.json | 1 + thermal/thermal_info_config_tokay_wingboard.json | 1 + 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 165041b7..36846c91 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -957,6 +957,7 @@ "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"8.0", + "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], @@ -991,7 +992,6 @@ { "Name":"VIRTUAL-SKIN-CHARGE-WIRED", "Type":"UNKNOWN", - "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", @@ -1035,7 +1035,6 @@ { "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", "Type":"UNKNOWN", - "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", diff --git a/thermal/thermal_info_config_caiman_proto.json b/thermal/thermal_info_config_caiman_proto.json index 9270502b..5c1b193d 100644 --- a/thermal/thermal_info_config_caiman_proto.json +++ b/thermal/thermal_info_config_caiman_proto.json @@ -689,6 +689,7 @@ "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"5.0", + "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", diff --git a/thermal/thermal_info_config_caiman_wingboard.json b/thermal/thermal_info_config_caiman_wingboard.json index 70a4c95b..ae8e9be3 100644 --- a/thermal/thermal_info_config_caiman_wingboard.json +++ b/thermal/thermal_info_config_caiman_wingboard.json @@ -788,6 +788,7 @@ "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"7.0", + "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"], diff --git a/thermal/thermal_info_config_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json index c2e1085f..0a10d088 100644 --- a/thermal/thermal_info_config_charge_caiman.json +++ b/thermal/thermal_info_config_charge_caiman.json @@ -147,6 +147,7 @@ "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"8.0", + "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], @@ -181,7 +182,6 @@ { "Name":"VIRTUAL-SKIN-CHARGE-WIRED", "Type":"UNKNOWN", - "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", @@ -225,7 +225,6 @@ { "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", "Type":"UNKNOWN", - "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json index bc26f4fb..37ccb2dc 100644 --- a/thermal/thermal_info_config_charge_komodo.json +++ b/thermal/thermal_info_config_charge_komodo.json @@ -147,6 +147,7 @@ "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"9.0", + "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], @@ -181,7 +182,6 @@ { "Name":"VIRTUAL-SKIN-CHARGE-WIRED", "Type":"UNKNOWN", - "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", @@ -225,7 +225,6 @@ { "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", "Type":"UNKNOWN", - "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", diff --git a/thermal/thermal_info_config_charge_tokay.json b/thermal/thermal_info_config_charge_tokay.json index 621fae2f..459a8175 100644 --- a/thermal/thermal_info_config_charge_tokay.json +++ b/thermal/thermal_info_config_charge_tokay.json @@ -147,6 +147,7 @@ "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"9.0", + "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], @@ -181,7 +182,6 @@ { "Name":"VIRTUAL-SKIN-CHARGE-WIRED", "Type":"UNKNOWN", - "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", @@ -225,7 +225,6 @@ { "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", "Type":"UNKNOWN", - "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 718e01be..dd826145 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -944,6 +944,7 @@ "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"9.0", + "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], @@ -978,7 +979,6 @@ { "Name":"VIRTUAL-SKIN-CHARGE-WIRED", "Type":"UNKNOWN", - "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", @@ -1022,7 +1022,6 @@ { "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", "Type":"UNKNOWN", - "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", diff --git a/thermal/thermal_info_config_komodo_proto.json b/thermal/thermal_info_config_komodo_proto.json index 3fbc17aa..1261a0f8 100644 --- a/thermal/thermal_info_config_komodo_proto.json +++ b/thermal/thermal_info_config_komodo_proto.json @@ -788,6 +788,7 @@ "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"5.0", + "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", diff --git a/thermal/thermal_info_config_komodo_wingboard.json b/thermal/thermal_info_config_komodo_wingboard.json index 796bf3de..6d5a5117 100644 --- a/thermal/thermal_info_config_komodo_wingboard.json +++ b/thermal/thermal_info_config_komodo_wingboard.json @@ -786,6 +786,7 @@ "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"8.0", + "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"], diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index 601e7f26..95adfa34 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -960,6 +960,7 @@ "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"9.0", + "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], @@ -994,7 +995,6 @@ { "Name":"VIRTUAL-SKIN-CHARGE-WIRED", "Type":"UNKNOWN", - "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", @@ -1038,7 +1038,6 @@ { "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", "Type":"UNKNOWN", - "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", diff --git a/thermal/thermal_info_config_tokay_proto.json b/thermal/thermal_info_config_tokay_proto.json index e47d586c..4f0d652b 100644 --- a/thermal/thermal_info_config_tokay_proto.json +++ b/thermal/thermal_info_config_tokay_proto.json @@ -712,6 +712,7 @@ "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"5.0", + "Hidden":true, "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", diff --git a/thermal/thermal_info_config_tokay_wingboard.json b/thermal/thermal_info_config_tokay_wingboard.json index a1439470..f3379e3d 100644 --- a/thermal/thermal_info_config_tokay_wingboard.json +++ b/thermal/thermal_info_config_tokay_wingboard.json @@ -846,6 +846,7 @@ "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"8.0", + "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], From b9548851c9a8fbdcf1f3dea306d04bf6d59437d2 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Tue, 30 Apr 2024 10:46:15 +0800 Subject: [PATCH 3/6] gps: disable AGPS L5 Bug: 336287475 Test: verify pass in b/336287475#comment25 Change-Id: Iffde98de5b7c8ea1e5218b87ff80d2ee31b065c0 --- location/caiman/user/gps.cfg | 2 +- location/caiman/userdebug/gps.cfg | 2 +- location/komodo/user/gps.cfg | 2 +- location/komodo/userdebug/gps.cfg | 2 +- location/ripcurrent24/user/gps.cfg | 2 +- location/ripcurrent24/userdebug/gps.cfg | 2 +- location/ripcurrentpro/user/gps.cfg | 2 +- location/ripcurrentpro/userdebug/gps.cfg | 2 +- location/tokay/user/gps.cfg | 2 +- location/tokay/userdebug/gps.cfg | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index a65dcd87..cdef97f7 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -53,7 +53,7 @@ GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 -CP_LocTech_Constraints=0x81 +CP_LocTech_Constraints=1 CP_LocTech_Requirements=0 UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index 4711d758..cd2c428f 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -179,7 +179,7 @@ GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 -CP_LocTech_Constraints=0x81 +CP_LocTech_Constraints=1 CP_LocTech_Requirements=0 UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index bace6743..c678ba6f 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -53,7 +53,7 @@ GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 -CP_LocTech_Constraints=0x81 +CP_LocTech_Constraints=1 CP_LocTech_Requirements=0 UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index d6b1dd57..d4d70cf4 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -179,7 +179,7 @@ GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 -CP_LocTech_Constraints=0x81 +CP_LocTech_Constraints=1 CP_LocTech_Requirements=0 UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index 0fa6424e..b0b1821f 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -52,7 +52,7 @@ GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 -CP_LocTech_Constraints=0x81 +CP_LocTech_Constraints=1 CP_LocTech_Requirements=0 UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index 6601f49d..989b98a6 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -178,7 +178,7 @@ GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 -CP_LocTech_Constraints=0x81 +CP_LocTech_Constraints=1 CP_LocTech_Requirements=0 UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index 0fa6424e..b0b1821f 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -52,7 +52,7 @@ GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 -CP_LocTech_Constraints=0x81 +CP_LocTech_Constraints=1 CP_LocTech_Requirements=0 UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index 6601f49d..989b98a6 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -178,7 +178,7 @@ GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 -CP_LocTech_Constraints=0x81 +CP_LocTech_Constraints=1 CP_LocTech_Requirements=0 UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 150da4e1..96dc360c 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -53,7 +53,7 @@ GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 -CP_LocTech_Constraints=0x81 +CP_LocTech_Constraints=1 CP_LocTech_Requirements=0 UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index e913d7a8..5911e0c8 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -179,7 +179,7 @@ GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 -CP_LocTech_Constraints=0x81 +CP_LocTech_Constraints=1 CP_LocTech_Requirements=0 UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 From b64afc1747e68da4ad8bbbf7bc93a024d5c4e789 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Thu, 2 May 2024 20:26:43 +0000 Subject: [PATCH 4/6] Revert "Set big core to cpu skip mask by default" This reverts commit 2cc7bc7c3d07ade96dfdc03bb957e2cf33751901. Reason for revert: may get geekbench5/6 regressed Bug: 338140604 Bug: 338141118 Change-Id: I76b2b98ca233fccc1f9a15c99bbb622bd7869392 --- perf/powerhint-caiman.json | 37 +------------------------------ perf/powerhint-komodo.json | 37 +------------------------------ perf/powerhint-ripcurrentpro.json | 37 +------------------------------ perf/powerhint-tokay.json | 37 +------------------------------ 4 files changed, 4 insertions(+), 144 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 5c36a43b..96fc3d46 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -221,6 +221,7 @@ "0x0", "0x80" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -864,12 +865,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUSkipMask", - "Duration": 5000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1017,12 +1012,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH_EXTEND", - "Node": "CPUSkipMask", - "Duration": 2000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1297,12 +1286,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUSkipMask", - "Duration": 1000, - "Value": "0x0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1897,12 +1880,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2323,12 +2300,6 @@ "Duration": 0, "Value": "4-7" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2473,12 +2444,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index fa2beb7b..5083ecfa 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -221,6 +221,7 @@ "0x0", "0x80" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -864,12 +865,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUSkipMask", - "Duration": 5000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1017,12 +1012,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH_EXTEND", - "Node": "CPUSkipMask", - "Duration": 2000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1297,12 +1286,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUSkipMask", - "Duration": 1000, - "Value": "0x0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1897,12 +1880,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2323,12 +2300,6 @@ "Duration": 0, "Value": "4-7" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2473,12 +2444,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index 8513e0be..d2984619 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -274,6 +274,7 @@ "0x0", "0x80" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -853,12 +854,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUSkipMask", - "Duration": 5000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1006,12 +1001,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH_EXTEND", - "Node": "CPUSkipMask", - "Duration": 2000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1286,12 +1275,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUSkipMask", - "Duration": 1000, - "Value": "0x0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1886,12 +1869,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2312,12 +2289,6 @@ "Duration": 0, "Value": "4-7" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2462,12 +2433,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 5c36a43b..96fc3d46 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -221,6 +221,7 @@ "0x0", "0x80" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -864,12 +865,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUSkipMask", - "Duration": 5000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1017,12 +1012,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH_EXTEND", - "Node": "CPUSkipMask", - "Duration": 2000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1297,12 +1286,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUSkipMask", - "Duration": 1000, - "Value": "0x0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1897,12 +1880,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2323,12 +2300,6 @@ "Duration": 0, "Value": "4-7" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2473,12 +2444,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", From 1a2a883b475934a5a2dc1c6b17777ce5494506cf Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 2 May 2024 21:54:35 +0000 Subject: [PATCH 5/6] thermal: Move TPU to the VSKIN-SOC PID loop Bug: 322223131 Test: run TPU test Change-Id: I9ed71aed7d2469bbeab0e792d72b2e4c5f618ebc --- thermal/thermal_info_config_caiman.json | 24 +++++++++++++++++------- thermal/thermal_info_config_komodo.json | 22 ++++++++++++++++------ thermal/thermal_info_config_tokay.json | 22 ++++++++++++++++------ 3 files changed, 49 insertions(+), 19 deletions(-) diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 165041b7..336d1a95 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -355,10 +355,6 @@ "Sensor": "VIRTUAL-SKIN-LSTM-MODEL" }, "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] - }, { "CdevRequest": "gxp-cooling", "LimitInfo": [0, 0, 0, 0, 0, 6, 6] @@ -376,7 +372,7 @@ 0.055, 0.002, 0.029, 0.061, 0.072, 0.011, 0.04, 0.027, 0.072, 0.071, 0.003, 0.026, 0.03, 0.04, 0.015, 0.001, 0.035, 0.042], "OffsetThresholds": [0.0], - "OffsetValues": [-490.0], + "OffsetValues": [-490.0], "Multiplier": 0.001 }, { @@ -705,7 +701,7 @@ ] }, { - "Name":"VIRTUAL-SKIN-CPU-GPU", + "Name":"VIRTUAL-SKIN-SOC", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -725,7 +721,7 @@ "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] }, @@ -765,6 +761,15 @@ "BindedPowerRail": "S2S_VDD_G3D", "CdevCeiling": [0, 9, 9, 9, 10, 12, 12], "LimitInfo": [0, 0, 0, 0, 0, 12, 12] + }, + { + "CdevRequest": "tpu_cooling", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S7M_VDD_TPU", + "CdevCeiling": [0, 7, 7, 7, 7, 7, 7], + "LimitInfo": [0, 0, 0, 0, 0, 7, 7] } ] }, @@ -1200,6 +1205,11 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 }, + { + "Name":"S7M_VDD_TPU", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, { "Name":"S2S_VDD_G3D", "PowerSampleDelay":7000, diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 718e01be..19a5ecb2 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -345,10 +345,6 @@ "Sensor": "VIRTUAL-SKIN-LSTM-MODEL" }, "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] - }, { "CdevRequest": "gxp-cooling", "LimitInfo": [0, 0, 0, 0, 0, 6, 6] @@ -681,7 +677,7 @@ ] }, { - "Name":"VIRTUAL-SKIN-CPU-GPU", + "Name":"VIRTUAL-SKIN-SOC", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -701,7 +697,7 @@ "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] }, @@ -741,6 +737,15 @@ "BindedPowerRail": "S2S_VDD_G3D", "CdevCeiling": [0, 9, 9, 9, 10, 12, 12], "LimitInfo": [0, 0, 0, 0, 0, 12, 12] + }, + { + "CdevRequest": "tpu_cooling", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S7M_VDD_TPU", + "CdevCeiling": [0, 7, 7, 7, 7, 7, 7], + "LimitInfo": [0, 0, 0, 0, 0, 7, 7] } ] }, @@ -1192,6 +1197,11 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 }, + { + "Name":"S7M_VDD_TPU", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, { "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index 601e7f26..e62f4b52 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -334,10 +334,6 @@ "Sensor": "VIRTUAL-SKIN-LSTM-MODEL" }, "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] - }, { "CdevRequest": "gxp-cooling", "LimitInfo": [0, 0, 0, 0, 0, 6, 6] @@ -686,7 +682,7 @@ ] }, { - "Name":"VIRTUAL-SKIN-CPU-GPU", + "Name":"VIRTUAL-SKIN-SOC", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -706,7 +702,7 @@ "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] }, @@ -746,6 +742,15 @@ "BindedPowerRail": "S2S_VDD_G3D", "CdevCeiling": [0, 9, 9, 9, 10, 12, 12], "LimitInfo": [0, 0, 0, 0, 0, 12, 12] + }, + { + "CdevRequest": "tpu_cooling", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S7M_VDD_TPU", + "CdevCeiling": [0, 7, 7, 7, 7, 7, 7], + "LimitInfo": [0, 0, 0, 0, 0, 7, 7] } ] }, @@ -1208,6 +1213,11 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 }, + { + "Name":"S7M_VDD_TPU", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, { "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, From bc80d65178cd51e99882b05da05f2be51b2bef5b Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Thu, 2 May 2024 16:37:51 +0800 Subject: [PATCH 6/6] odpm: support 2 random mappings to iio device VSYS_PWR_MMWAVE will be replaced with S12S_VDD_AUR on SUB6 only sku. The replacement failed sometimes because there are 2 random mappings to iio device. Mapping 1 iio:device0 -> s2mpg14-odpm iio:device1 -> s2mpg15-odpm Mapping 2 iio:device0 -> s2mpg15-odpm iio:device1 -> s2mpg14-odpm Bug: 337665886 Bug: 338416918 Bug: 338316877 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: I1c6f3ccc32a73f5b4758571882c4fca9df00c36a Signed-off-by: Darren Hsu --- conf/init.caiman.rc | 2 ++ conf/init.komodo.rc | 2 ++ conf/init.tokay.rc | 2 ++ 3 files changed, 6 insertions(+) diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc index c7b3fbac..5fd9bc26 100644 --- a/conf/init.caiman.rc +++ b/conf/init.caiman.rc @@ -62,8 +62,10 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet # ODPM on early-boot && property:ro.boot.hardware.sku=GEC77 + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S" on early-boot && property:ro.boot.hardware.sku=GWVK6 + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S" # Start the twoshay touch service diff --git a/conf/init.komodo.rc b/conf/init.komodo.rc index c7c9e96f..3ea5e2b2 100644 --- a/conf/init.komodo.rc +++ b/conf/init.komodo.rc @@ -66,8 +66,10 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet # ODPM on early-boot && property:ro.boot.hardware.sku=GZC4K + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S" on early-boot && property:ro.boot.hardware.sku=GQ57S + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S" # Start the twoshay touch service diff --git a/conf/init.tokay.rc b/conf/init.tokay.rc index d1172b87..5fa1787c 100644 --- a/conf/init.tokay.rc +++ b/conf/init.tokay.rc @@ -58,8 +58,10 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet # ODPM on early-boot && property:ro.boot.hardware.sku=GUR25 + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S" on early-boot && property:ro.boot.hardware.sku=G1B60 + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S" # Start the twoshay touch service