diff options
author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2024-01-07 18:59:59 -0800 |
---|---|---|
committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2024-01-07 18:59:59 -0800 |
commit | a8425d25b85dca6573a6d32210b19dfd5f11546a (patch) | |
tree | e5f385d7ad2b2395044eeefead030edb09c9cfe2 | |
parent | b97bc45cc2cf7c6b854a8220e1fa211f52155d2a (diff) | |
parent | 85579d4c46fe544eb5e294bf02e4bb74c5b8fae9 (diff) | |
download | shusky-a8425d25b85dca6573a6d32210b19dfd5f11546a.tar.gz |
Merge android14-gs-pixel-5.15-udc-qpr1 into android14-gs-pixel-5.15-udc-d2android-14.0.0_r0.81android-14.0.0_r0.80android-gs-akita-5.15-android14-d2
SBMerger: 571992243
Change-Id: I7b433f65ebde8cd3abecbbd8823e29f76de957a9
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 |
2 files changed, 12 insertions, 12 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 */ |