diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-11-12 18:49:13 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-11-12 18:49:13 -0800 |
| commit | e590d0e1ed560dd901de8cd087322d2e1118fe40 (patch) | |
| tree | 95adb60d5d9fcd06bd58d392bd7d920d24969b6c | |
| parent | 60ef5e917b8255067b7752561cd52631243f213f (diff) | |
| parent | 8c992b5b5ae1b325bf81c5d46b4f9c2bbbc25e7e (diff) | |
| download | shusky-e590d0e1ed560dd901de8cd087322d2e1118fe40.tar.gz | |
Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15
SBMerger: 571992243
Change-Id: Id32993499b9033bb68bb6e7728ec5f4e7cac9901
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | dts/google/zuma-husky-battery-data.dtsi | 12 | ||||
| -rw-r--r-- | dts/google/zuma-shiba-battery-data.dtsi | 12 | ||||
| -rw-r--r-- | dts/google/zuma-shusky-usb.dtsi | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/dts/google/zuma-husky-battery-data.dtsi b/dts/google/zuma-husky-battery-data.dtsi index 34346a9..280a028 100644 --- a/dts/google/zuma-husky-battery-data.dtsi +++ b/dts/google/zuma-husky-battery-data.dtsi @@ -51,10 +51,10 @@ maxim,config { >; }; - /* ATL: HK3_ATL(3340)_RC2_Rev2.txt, b/274869304#comment1 */ + /* HK3_ATL(3340)_RC2_Rev4.txt b/309039411#comment4 */ maxim,atl-a1-1k { maxim,batt-id-kohm = <1>; - maxim,model-version = <3>; + maxim,model-version = <4>; maxim,force-reset-model-data; maxim,rc1-tempco = /bits/ 16 <0x0e1f>; maxim,rc2-tempco = /bits/ 16 <0x1402>; @@ -90,7 +90,7 @@ maxim,config { /* 0x002C */ 0xED51 /* TGain */ /* 0x002D */ 0x1EBA /* TOff */ /* 0x00B9 */ 0x0014 /* Curve */ - /* 0x002B */ 0x6030 /* MiscCFG */ + /* 0x002B */ 0x6070 /* MiscCFG */ /* 0x0004 */ 0x1900 /* AtRate */ /* 0x0049 */ 0x2241 /* convgcfg */ /* 0x0029 */ 0x0613 /* FilterCFG */ @@ -98,10 +98,10 @@ maxim,config { >; }; - /* COS: HK3_COS(3341)_RC2_Rev2.txt, b/274869304#comment1 */ + /* HK3_COS(3341)_RC2_Rev4.txt b/309039411#comment4 */ maxim,cos-a1-2k { maxim,batt-id-kohm = <2>; - maxim,model-version = <3>; + maxim,model-version = <4>; maxim,force-reset-model-data; maxim,rc1-tempco = /bits/ 16 <0x0f1f>; maxim,rc2-tempco = /bits/ 16 <0x1602>; @@ -137,7 +137,7 @@ maxim,config { /* 0x002C */ 0xED51 /* TGain */ /* 0x002D */ 0x1EBA /* TOff */ /* 0x00B9 */ 0x0014 /* Curve */ - /* 0x002B */ 0x6030 /* MiscCFG */ + /* 0x002B */ 0x6070 /* MiscCFG */ /* 0x0004 */ 0x1900 /* AtRate */ /* 0x0049 */ 0x2241 /* convgcfg */ /* 0x0029 */ 0x0613 /* FilterCFG */ diff --git a/dts/google/zuma-shiba-battery-data.dtsi b/dts/google/zuma-shiba-battery-data.dtsi index e2ade77..2cfd3e9 100644 --- a/dts/google/zuma-shiba-battery-data.dtsi +++ b/dts/google/zuma-shiba-battery-data.dtsi @@ -51,10 +51,10 @@ maxim,config { >; }; - /* ATL: SB3_ATL_3347_20230501_BC59_RC2.ini.txt, b/280498363#comment1 */ + /* SB3_ATL_3347_20231103_BC59_RC2.ini.txt, b/309029823#comment4 */ maxim,atl-a1-1k { maxim,batt-id-kohm = <1>; - maxim,model-version = <5>; + maxim,model-version = <6>; maxim,force-reset-model-data; maxim,rc1-tempco = /bits/ 16 <0x131f>; maxim,rc2-tempco = /bits/ 16 <0x1202>; @@ -90,7 +90,7 @@ maxim,config { /* 0x002C */ 0xED51 /* TGain */ /* 0x002D */ 0x1EBA /* TOff */ /* 0x00B9 */ 0x0014 /* Curve */ - /* 0x002B */ 0x6030 /* MiscCFG */ + /* 0x002B */ 0x6070 /* MiscCFG */ /* 0x0004 */ 0x1900 /* AtRate */ /* 0x0049 */ 0x2241 /* convgcfg */ /* 0x0029 */ 0x0613 /* FilterCFG */ @@ -98,10 +98,10 @@ maxim,config { >; }; - /* COS: SB3_COS_3348_20230501_BC59_RC2.ini.txt, b/280498363#comment1 */ + /* SB3_COS_3348_20231103_BC59_RC2.ini.txt, b/309029823#comment4 */ maxim,cos-a1-2k { maxim,batt-id-kohm = <2>; - maxim,model-version = <4>; + maxim,model-version = <5>; maxim,force-reset-model-data; maxim,rc1-tempco = /bits/ 16 <0x0b22>; maxim,rc2-tempco = /bits/ 16 <0x1602>; @@ -137,7 +137,7 @@ maxim,config { /* 0x002C */ 0xED51 /* TGain */ /* 0x002D */ 0x1EBA /* TOff */ /* 0x00B9 */ 0x0014 /* Curve */ - /* 0x002B */ 0x6030 /* MiscCFG */ + /* 0x002B */ 0x6070 /* MiscCFG */ /* 0x0004 */ 0x1900 /* AtRate */ /* 0x0049 */ 0x2241 /* convgcfg */ /* 0x0029 */ 0x0613 /* FilterCFG */ diff --git a/dts/google/zuma-shusky-usb.dtsi b/dts/google/zuma-shusky-usb.dtsi index 583943e..1b2710c 100644 --- a/dts/google/zuma-shusky-usb.dtsi +++ b/dts/google/zuma-shusky-usb.dtsi @@ -45,7 +45,7 @@ repeater_tune2 { tune_name = "u_tx_adjust_port1"; - tune_value = <0x70 0x76 0x0 0xff>; + tune_value = <0x70 0x3c 0x0 0xff>; }; repeater_tune3 { @@ -60,7 +60,7 @@ repeater_tune5 { tune_name = "u_disconnect_squelch_port1"; - tune_value = <0x73 0x04 0x0 0xff>; + tune_value = <0x73 0x83 0x0 0xff>; }; repeater_tune6 { |