Merge "gps: Update gps.cfg for GNSS FW 4.15.0.150.P1" into 24D1-dev am: f92e831c5e

Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/26574457

Change-Id: I6fe347f8d4a75faa2e21f83ba2196a12ca80d8d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Chiu 2024-03-15 03:26:22 +00:00 committed by Automerger Merge Worker
commit b1e3c9ea9e
10 changed files with 22 additions and 25 deletions

View file

@ -21,8 +21,6 @@ ChipCfg_VDR_low_end_Time = 20
Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_AidingConfiguration=0x00020046
Chip_Configuration_RefClkControl=0x24 Chip_Configuration_RefClkControl=0x24
Chip_Configuration_DCXO_CrystalType=0x11 Chip_Configuration_DCXO_CrystalType=0x11
Chip_Configuration_GNSSConstConstraintDef = 0x60BF
LocTech_Constraints = 0x60BF
Chip_Configuration_RfMiscCtrl = 0x80008001 Chip_Configuration_RfMiscCtrl = 0x80008001
bdsUsedInUSPolicy=2 bdsUsedInUSPolicy=2
sbasUsedInUSPolicy=2 sbasUsedInUSPolicy=2
@ -65,6 +63,7 @@ isUseUncalAccel=1
GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_CONFIG_BEGIN
GNSS_CARRIER_ID=0 GNSS_CARRIER_ID=0
ENABLE_CAPS_OTDOA=1
ENABLE_2G_CP_CAPS_MSA=1 ENABLE_2G_CP_CAPS_MSA=1
ENABLE_2G_CP_CAPS_MSB=1 ENABLE_2G_CP_CAPS_MSB=1
ENABLE_3G_CP_CAPS_MSA=1 ENABLE_3G_CP_CAPS_MSA=1

View file

@ -90,9 +90,6 @@ Chip_Configuration_DCXO_CrystalType=0x11
# Range should be 2000 to 3100 # Range should be 2000 to 3100
#Chip_Configuration_DCXO_InflectionPoint=2855 #Chip_Configuration_DCXO_InflectionPoint=2855
# L1 + L5 MCW
Chip_Configuration_GNSSConstConstraintDef = 0x60BF
LocTech_Constraints = 0x60BF
Chip_Configuration_RfMiscCtrl = 0x80008001 Chip_Configuration_RfMiscCtrl = 0x80008001
### 2C48 L1 only MCW ### ### 2C48 L1 only MCW ###
@ -198,6 +195,7 @@ isUseUncalAccel=1
GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_CONFIG_BEGIN
# DEFAULT # DEFAULT
GNSS_CARRIER_ID=0 GNSS_CARRIER_ID=0
ENABLE_CAPS_OTDOA=1
ENABLE_2G_CP_CAPS_MSA=1 ENABLE_2G_CP_CAPS_MSA=1
ENABLE_2G_CP_CAPS_MSB=1 ENABLE_2G_CP_CAPS_MSB=1
ENABLE_3G_CP_CAPS_MSA=1 ENABLE_3G_CP_CAPS_MSA=1

View file

@ -21,8 +21,6 @@ ChipCfg_VDR_low_end_Time = 20
Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_AidingConfiguration=0x00020046
Chip_Configuration_RefClkControl=0x24 Chip_Configuration_RefClkControl=0x24
Chip_Configuration_DCXO_CrystalType=0x11 Chip_Configuration_DCXO_CrystalType=0x11
Chip_Configuration_GNSSConstConstraintDef = 0x60BF
LocTech_Constraints = 0x60BF
Chip_Configuration_RfMiscCtrl = 0x80008001 Chip_Configuration_RfMiscCtrl = 0x80008001
bdsUsedInUSPolicy=2 bdsUsedInUSPolicy=2
sbasUsedInUSPolicy=2 sbasUsedInUSPolicy=2
@ -65,6 +63,7 @@ isUseUncalAccel=1
GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_CONFIG_BEGIN
GNSS_CARRIER_ID=0 GNSS_CARRIER_ID=0
ENABLE_CAPS_OTDOA=1
ENABLE_2G_CP_CAPS_MSA=1 ENABLE_2G_CP_CAPS_MSA=1
ENABLE_2G_CP_CAPS_MSB=1 ENABLE_2G_CP_CAPS_MSB=1
ENABLE_3G_CP_CAPS_MSA=1 ENABLE_3G_CP_CAPS_MSA=1

View file

@ -90,9 +90,6 @@ Chip_Configuration_DCXO_CrystalType=0x11
# Range should be 2000 to 3100 # Range should be 2000 to 3100
#Chip_Configuration_DCXO_InflectionPoint=2855 #Chip_Configuration_DCXO_InflectionPoint=2855
# L1 + L5 MCW
Chip_Configuration_GNSSConstConstraintDef = 0x60BF
LocTech_Constraints = 0x60BF
Chip_Configuration_RfMiscCtrl = 0x80008001 Chip_Configuration_RfMiscCtrl = 0x80008001
### 2C48 L1 only MCW ### ### 2C48 L1 only MCW ###
@ -198,6 +195,7 @@ isUseUncalAccel=1
GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_CONFIG_BEGIN
# DEFAULT # DEFAULT
GNSS_CARRIER_ID=0 GNSS_CARRIER_ID=0
ENABLE_CAPS_OTDOA=1
ENABLE_2G_CP_CAPS_MSA=1 ENABLE_2G_CP_CAPS_MSA=1
ENABLE_2G_CP_CAPS_MSB=1 ENABLE_2G_CP_CAPS_MSB=1
ENABLE_3G_CP_CAPS_MSA=1 ENABLE_3G_CP_CAPS_MSA=1

View file

@ -7,6 +7,8 @@ GlueLayer_EnableGnssCfgInterface=1
gnss_device_type=K042 gnss_device_type=K042
gnss_device_patch_address=0 gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin gnss_device_patch_file=/vendor/firmware/kepler.bin
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
chpp_betp_client=1 chpp_betp_client=1
gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc
gnss_device_data_port_chpp_present=1 gnss_device_data_port_chpp_present=1
@ -19,8 +21,6 @@ ChipCfg_VDR_low_end_Time = 20
Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_AidingConfiguration=0x00020046
Chip_Configuration_RefClkControl=0x24 Chip_Configuration_RefClkControl=0x24
Chip_Configuration_DCXO_CrystalType=0x11 Chip_Configuration_DCXO_CrystalType=0x11
Chip_Configuration_GNSSConstConstraintDef = 0x60BF
LocTech_Constraints = 0x60BF
Chip_Configuration_RfMiscCtrl = 0x80008001 Chip_Configuration_RfMiscCtrl = 0x80008001
bdsUsedInUSPolicy=2 bdsUsedInUSPolicy=2
sbasUsedInUSPolicy=2 sbasUsedInUSPolicy=2
@ -59,6 +59,7 @@ isUseUncalAccel=1
GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_CONFIG_BEGIN
GNSS_CARRIER_ID=0 GNSS_CARRIER_ID=0
ENABLE_CAPS_OTDOA=1
ENABLE_2G_CP_CAPS_MSA=1 ENABLE_2G_CP_CAPS_MSA=1
ENABLE_2G_CP_CAPS_MSB=1 ENABLE_2G_CP_CAPS_MSB=1
ENABLE_3G_CP_CAPS_MSA=1 ENABLE_3G_CP_CAPS_MSA=1

View file

@ -20,6 +20,10 @@ gnss_device_type=K042
gnss_device_patch_address=0 gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin gnss_device_patch_file=/vendor/firmware/kepler.bin
# enable ism stream for GAAM
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
# CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK
#Chip_Configuration_Io_Options=0x9 #Chip_Configuration_Io_Options=0x9
# enable DEBUG sync msg # enable DEBUG sync msg
@ -86,9 +90,6 @@ Chip_Configuration_DCXO_CrystalType=0x11
# Range should be 2000 to 3100 # Range should be 2000 to 3100
#Chip_Configuration_DCXO_InflectionPoint=2855 #Chip_Configuration_DCXO_InflectionPoint=2855
# L1 + L5 MCW
Chip_Configuration_GNSSConstConstraintDef = 0x60BF
LocTech_Constraints = 0x60BF
Chip_Configuration_RfMiscCtrl = 0x80008001 Chip_Configuration_RfMiscCtrl = 0x80008001
### 2C48 L1 only MCW ### ### 2C48 L1 only MCW ###
@ -190,6 +191,7 @@ isUseUncalAccel=1
GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_CONFIG_BEGIN
# DEFAULT # DEFAULT
GNSS_CARRIER_ID=0 GNSS_CARRIER_ID=0
ENABLE_CAPS_OTDOA=1
ENABLE_2G_CP_CAPS_MSA=1 ENABLE_2G_CP_CAPS_MSA=1
ENABLE_2G_CP_CAPS_MSB=1 ENABLE_2G_CP_CAPS_MSB=1
ENABLE_3G_CP_CAPS_MSA=1 ENABLE_3G_CP_CAPS_MSA=1

View file

@ -7,6 +7,8 @@ GlueLayer_EnableGnssCfgInterface=1
gnss_device_type=K042 gnss_device_type=K042
gnss_device_patch_address=0 gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin gnss_device_patch_file=/vendor/firmware/kepler.bin
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
chpp_betp_client=1 chpp_betp_client=1
gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc
gnss_device_data_port_chpp_present=1 gnss_device_data_port_chpp_present=1
@ -19,8 +21,6 @@ ChipCfg_VDR_low_end_Time = 20
Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_AidingConfiguration=0x00020046
Chip_Configuration_RefClkControl=0x24 Chip_Configuration_RefClkControl=0x24
Chip_Configuration_DCXO_CrystalType=0x11 Chip_Configuration_DCXO_CrystalType=0x11
Chip_Configuration_GNSSConstConstraintDef = 0x60BF
LocTech_Constraints = 0x60BF
Chip_Configuration_RfMiscCtrl = 0x80008001 Chip_Configuration_RfMiscCtrl = 0x80008001
bdsUsedInUSPolicy=2 bdsUsedInUSPolicy=2
sbasUsedInUSPolicy=2 sbasUsedInUSPolicy=2
@ -59,6 +59,7 @@ isUseUncalAccel=1
GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_CONFIG_BEGIN
GNSS_CARRIER_ID=0 GNSS_CARRIER_ID=0
ENABLE_CAPS_OTDOA=1
ENABLE_2G_CP_CAPS_MSA=1 ENABLE_2G_CP_CAPS_MSA=1
ENABLE_2G_CP_CAPS_MSB=1 ENABLE_2G_CP_CAPS_MSB=1
ENABLE_3G_CP_CAPS_MSA=1 ENABLE_3G_CP_CAPS_MSA=1

View file

@ -20,6 +20,10 @@ gnss_device_type=K042
gnss_device_patch_address=0 gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin gnss_device_patch_file=/vendor/firmware/kepler.bin
# enable ism stream for GAAM
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
# CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK
#Chip_Configuration_Io_Options=0x9 #Chip_Configuration_Io_Options=0x9
# enable DEBUG sync msg # enable DEBUG sync msg
@ -86,9 +90,6 @@ Chip_Configuration_DCXO_CrystalType=0x11
# Range should be 2000 to 3100 # Range should be 2000 to 3100
#Chip_Configuration_DCXO_InflectionPoint=2855 #Chip_Configuration_DCXO_InflectionPoint=2855
# L1 + L5 MCW
Chip_Configuration_GNSSConstConstraintDef = 0x60BF
LocTech_Constraints = 0x60BF
Chip_Configuration_RfMiscCtrl = 0x80008001 Chip_Configuration_RfMiscCtrl = 0x80008001
### 2C48 L1 only MCW ### ### 2C48 L1 only MCW ###
@ -190,6 +191,7 @@ isUseUncalAccel=1
GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_CONFIG_BEGIN
# DEFAULT # DEFAULT
GNSS_CARRIER_ID=0 GNSS_CARRIER_ID=0
ENABLE_CAPS_OTDOA=1
ENABLE_2G_CP_CAPS_MSA=1 ENABLE_2G_CP_CAPS_MSA=1
ENABLE_2G_CP_CAPS_MSB=1 ENABLE_2G_CP_CAPS_MSB=1
ENABLE_3G_CP_CAPS_MSA=1 ENABLE_3G_CP_CAPS_MSA=1

View file

@ -21,8 +21,6 @@ ChipCfg_VDR_low_end_Time = 20
Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_AidingConfiguration=0x00020046
Chip_Configuration_RefClkControl=0x24 Chip_Configuration_RefClkControl=0x24
Chip_Configuration_DCXO_CrystalType=0x11 Chip_Configuration_DCXO_CrystalType=0x11
Chip_Configuration_GNSSConstConstraintDef = 0x60BF
LocTech_Constraints = 0x60BF
Chip_Configuration_RfMiscCtrl = 0x80008001 Chip_Configuration_RfMiscCtrl = 0x80008001
bdsUsedInUSPolicy=2 bdsUsedInUSPolicy=2
sbasUsedInUSPolicy=2 sbasUsedInUSPolicy=2
@ -65,6 +63,7 @@ isUseUncalAccel=1
GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_CONFIG_BEGIN
GNSS_CARRIER_ID=0 GNSS_CARRIER_ID=0
ENABLE_CAPS_OTDOA=1
ENABLE_2G_CP_CAPS_MSA=1 ENABLE_2G_CP_CAPS_MSA=1
ENABLE_2G_CP_CAPS_MSB=1 ENABLE_2G_CP_CAPS_MSB=1
ENABLE_3G_CP_CAPS_MSA=1 ENABLE_3G_CP_CAPS_MSA=1

View file

@ -90,9 +90,6 @@ Chip_Configuration_DCXO_CrystalType=0x11
# Range should be 2000 to 3100 # Range should be 2000 to 3100
#Chip_Configuration_DCXO_InflectionPoint=2855 #Chip_Configuration_DCXO_InflectionPoint=2855
# L1 + L5 MCW
Chip_Configuration_GNSSConstConstraintDef = 0x60BF
LocTech_Constraints = 0x60BF
Chip_Configuration_RfMiscCtrl = 0x80008001 Chip_Configuration_RfMiscCtrl = 0x80008001
### 2C48 L1 only MCW ### ### 2C48 L1 only MCW ###
@ -198,6 +195,7 @@ isUseUncalAccel=1
GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_CONFIG_BEGIN
# DEFAULT # DEFAULT
GNSS_CARRIER_ID=0 GNSS_CARRIER_ID=0
ENABLE_CAPS_OTDOA=1
ENABLE_2G_CP_CAPS_MSA=1 ENABLE_2G_CP_CAPS_MSA=1
ENABLE_2G_CP_CAPS_MSB=1 ENABLE_2G_CP_CAPS_MSB=1
ENABLE_3G_CP_CAPS_MSA=1 ENABLE_3G_CP_CAPS_MSA=1